This is an automated email from the ASF dual-hosted git repository.

robbie pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/qpid-site.git

commit 48e3c02a0f3cf28ec344a0370799061e0109ba57
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Mon Apr 5 16:55:25 2021 +0100

    update various bits to account for git repository branches being renamed to 
main
---
 Makefile                                                |  2 +-
 content/components/broker-j/index.html                  |  2 +-
 content/components/cpp-broker/index.html                |  2 +-
 content/components/dispatch-router/index.html           |  1 -
 content/components/messaging-api/index.html             |  4 ++--
 content/dashboard.html                                  | 17 ++++++++---------
 content/documentation.html                              |  1 -
 content/electron/index.html                             |  2 +-
 content/proton/index.html                               |  1 -
 .../messaging-api/cpp/examples/index.html               |  4 ++--
 .../messaging-api/cpp/examples/index.html               |  4 ++--
 .../messaging-api/cpp/examples/index.html               |  4 ++--
 content/releases/qpid-dispatch-1.0.0/release-notes.html |  4 ++--
 content/releases/qpid-dispatch-1.1.0/release-notes.html |  8 ++++----
 .../releases/qpid-dispatch-1.10.0/release-notes.html    |  2 +-
 .../releases/qpid-dispatch-1.12.0/release-notes.html    |  2 +-
 .../releases/qpid-dispatch-1.15.0/release-notes.html    |  4 ++--
 content/releases/qpid-dispatch-1.3.0/release-notes.html |  2 +-
 content/releases/qpid-dispatch-1.5.0/release-notes.html |  2 +-
 content/releases/qpid-dispatch-1.6.0/release-notes.html |  4 ++--
 content/releases/qpid-dispatch-1.7.0/release-notes.html |  2 +-
 content/releases/qpid-dispatch-1.9.0/release-notes.html |  2 +-
 content/releases/qpid-proton-0.29.0/release-notes.html  |  2 +-
 input/_transom_config.py                                |  6 +++---
 input/components/broker-j/index.md                      |  2 +-
 input/components/cpp-broker/index.md                    |  2 +-
 input/components/messaging-api/index.md                 |  4 ++--
 input/dashboard.md                                      |  4 ++--
 input/electron/index.md                                 |  2 +-
 .../qpid-cpp-1.37.0/messaging-api/cpp/examples/index.md |  4 ++--
 .../qpid-cpp-1.38.0/messaging-api/cpp/examples/index.md |  4 ++--
 .../qpid-cpp-1.39.0/messaging-api/cpp/examples/index.md |  4 ++--
 input/releases/qpid-dispatch-1.0.0/release-notes.md     |  6 +++---
 input/releases/qpid-dispatch-1.1.0/release-notes.md     | 10 +++++-----
 input/releases/qpid-dispatch-1.10.0/release-notes.md    |  4 ++--
 input/releases/qpid-dispatch-1.12.0/release-notes.md    |  2 +-
 input/releases/qpid-dispatch-1.15.0/release-notes.md    |  6 +++---
 input/releases/qpid-dispatch-1.3.0/release-notes.md     |  2 +-
 input/releases/qpid-dispatch-1.5.0/release-notes.md     |  2 +-
 input/releases/qpid-dispatch-1.6.0/release-notes.md     |  4 ++--
 input/releases/qpid-dispatch-1.7.0/release-notes.md     |  2 +-
 input/releases/qpid-dispatch-1.9.0/release-notes.md     |  4 ++--
 input/releases/qpid-proton-0.18.0/index.md              |  1 -
 input/releases/qpid-proton-0.18.1/index.md              |  1 -
 input/releases/qpid-proton-0.19.0/index.md              |  1 -
 input/releases/qpid-proton-0.20.0/index.md              |  1 -
 input/releases/qpid-proton-0.21.0/index.md              |  1 -
 input/releases/qpid-proton-0.22.0/index.md              |  3 +--
 input/releases/qpid-proton-0.23.0/index.md              |  3 +--
 input/releases/qpid-proton-0.24.0/index.md              |  3 +--
 input/releases/qpid-proton-0.25.0/index.md              |  3 +--
 input/releases/qpid-proton-0.26.0/index.md              |  3 +--
 input/releases/qpid-proton-0.27.0/index.md              |  3 +--
 input/releases/qpid-proton-0.27.1/index.md              |  3 +--
 input/releases/qpid-proton-0.28.0/index.md              |  3 +--
 input/releases/qpid-proton-0.29.0/index.md              |  3 +--
 input/releases/qpid-proton-0.29.0/release-notes.md      |  4 ++--
 input/releases/qpid-proton-0.30.0/index.md              |  3 +--
 input/releases/qpid-proton-0.31.0/index.md              |  3 +--
 input/releases/qpid-proton-0.32.0/index.md              |  3 +--
 input/releases/qpid-proton-0.33.0/index.md              |  3 +--
 python/generate.py                                      |  4 +++-
 scripts/gen-broker-j-release-notes                      |  4 ++--
 scripts/gen-broker-j-release-page                       |  6 +++---
 scripts/gen-cpp-release-docs                            |  4 ++--
 scripts/gen-cpp-release-notes                           |  4 ++--
 scripts/gen-cpp-release-page                            | 10 +++++-----
 scripts/gen-dispatch-release-notes                      |  4 ++--
 scripts/gen-dispatch-release-page                       | 12 ++++++------
 scripts/gen-interop-test-release-notes                  |  4 ++--
 scripts/gen-interop-test-release-page                   | 12 ++++++------
 scripts/gen-jms-amqp-0-x-release-notes                  |  4 ++--
 scripts/gen-jms-amqp-0-x-release-page                   | 12 ++++++------
 scripts/gen-jms-release-notes                           |  4 ++--
 scripts/gen-jms-release-page                            | 12 ++++++------
 scripts/gen-proton-j-release-notes                      |  4 ++--
 scripts/gen-proton-j-release-page                       | 12 ++++++------
 scripts/gen-proton-release-notes                        |  4 ++--
 scripts/gen-proton-release-page                         | 13 ++++++-------
 scripts/gen-python-release-notes                        |  4 ++--
 scripts/gen-python-release-page                         | 10 +++++-----
 scripts/list-current-committers                         |  8 ++++----
 82 files changed, 165 insertions(+), 186 deletions(-)

diff --git a/Makefile b/Makefile
index 6f2f336..d7d5999 100644
--- a/Makefile
+++ b/Makefile
@@ -119,4 +119,4 @@ $(foreach module,${SOURCE_MODULES},$(eval $(call 
RELEASE_TEMPLATE,${module})))
 
 .PHONY: update-%
 update-%:
-       curl "https://raw.githubusercontent.com/ssorj/$*/master/python/$*.py"; 
-o python/$*.py
+       curl "https://raw.githubusercontent.com/ssorj/$*/main/python/$*.py"; -o 
python/$*.py
diff --git a/content/components/broker-j/index.html 
b/content/components/broker-j/index.html
index 8881602..86c8753 100644
--- a/content/components/broker-j/index.html
+++ b/content/components/broker-j/index.html
@@ -159,7 +159,7 @@ that stores, routes, and forwards messages using AMQP.</p>
 
 <ul>
 <li><a href="/releases/qpid-broker-j-8.0.4/book/index.html">Broker 
book</a></li>
-<li><a 
href="https://github.com/apache/qpid-broker-j/blob/master/README.md";>How to 
build Apache Qpid Broker-J</a></li>
+<li><a href="https://github.com/apache/qpid-broker-j/blob/main/README.md";>How 
to build Apache Qpid Broker-J</a></li>
 </ul>
 
 </div>
diff --git a/content/components/cpp-broker/index.html 
b/content/components/cpp-broker/index.html
index e52f7c6..3118014 100644
--- a/content/components/cpp-broker/index.html
+++ b/content/components/cpp-broker/index.html
@@ -161,7 +161,7 @@ that stores, routes, and forwards messages using AMQP.</p>
 <ul>
 <li><a href="/releases/qpid-cpp-1.39.0/cpp-broker/book/index.html">C++ broker 
book</a></li>
 <li><a 
href="/releases/qpid-cpp-1.39.0/cpp-broker/book/chapter-Managing-CPP-Broker.html#section-Managing-CPP-Broker">Managing
 the C++ broker</a></li>
-<li><a 
href="https://raw.githubusercontent.com/apache/qpid-cpp/master/INSTALL.txt";>Installing
 Qpid C++</a></li>
+<li><a 
href="https://raw.githubusercontent.com/apache/qpid-cpp/main/INSTALL.txt";>Installing
 Qpid C++</a></li>
 <li><a 
href="https://cwiki.apache.org/confluence/display/qpid/qpid+extensions+to+amqp";>Qpid
 extensions to AMQP</a></li>
 </ul>
 
diff --git a/content/components/dispatch-router/index.html 
b/content/components/dispatch-router/index.html
index 6ba2b30..b314c47 100644
--- a/content/components/dispatch-router/index.html
+++ b/content/components/dispatch-router/index.html
@@ -173,7 +173,6 @@ they be clients, brokers or other AMQP-enabled services.  
More about
 <ul>
 <li><a href="/releases/qpid-dispatch-1.15.0">Qpid Dispatch 1.15.0</a></li>
 <li><a href="/releases/index.html#past-releases">Past releases</a></li>
-<li><a href="/releases/qpid-dispatch-master/index.html">Work in 
progress</a></li>
 </ul>
 
 <h2 id="issues">Issues</h2>
diff --git a/content/components/messaging-api/index.html 
b/content/components/messaging-api/index.html
index bd300df..b18ce5a 100644
--- a/content/components/messaging-api/index.html
+++ b/content/components/messaging-api/index.html
@@ -143,8 +143,8 @@ find previous versions with our
 <li><a 
href="/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/index.html">C++ 
examples</a></li>
 <li><a href="/releases/qpid-python-1.37.0/messaging-api/api/index.html">Python 
API reference</a></li>
 <li><a 
href="/releases/qpid-python-1.37.0/messaging-api/examples/index.html">Python 
examples</a></li>
-<li><a 
href="https://raw.githubusercontent.com/apache/qpid-cpp/master/INSTALL.txt";>Installing
 Qpid C++</a></li>
-<li><a 
href="https://raw.githubusercontent.com/apache/qpid-python/master/README.md";>Installing
 Qpid Python</a></li>
+<li><a 
href="https://raw.githubusercontent.com/apache/qpid-cpp/main/INSTALL.txt";>Installing
 Qpid C++</a></li>
+<li><a 
href="https://raw.githubusercontent.com/apache/qpid-python/main/README.md";>Installing
 Qpid Python</a></li>
 </ul>
 
 </div>
diff --git a/content/dashboard.html b/content/dashboard.html
index 50309e2..9cbc5a3 100644
--- a/content/dashboard.html
+++ b/content/dashboard.html
@@ -143,21 +143,21 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
   <td><a href="/components/broker-j/index.html">Qpid Broker-J</a></td>
   <td><a href="/releases/qpid-broker-j-8.0.4">8.0.4</a></td>
   <td><a href="https://issues.apache.org/jira/projects/QPID";>Summary</a> 
&#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPID+and+resolution+is+null+and+component+in+%28%22Broker-J%22%2C+%22Java+Build%22%2C+%22Java+Documentation%22%2C+%22Java+Performance+Tests%22%2C+%22Java+Tests%22%2C+%22Java+Tools%22%29";>Open
 issues</a> &#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPID+and+component+in+%28%22Broker-J%22%2C+%22Java+Build%22%2C+%22Java
 [...]
-  <td><a href="https://travis-ci.com/github/apache/qpid-broker-j";><img 
src="https://travis-ci.com/apache/qpid-broker-j.svg?branch=master"; 
height="20"/></a></td>
+  <td><a href="https://travis-ci.com/github/apache/qpid-broker-j";><img 
src="https://travis-ci.com/apache/qpid-broker-j.svg?branch=main"; 
height="20"/></a></td>
   <td><a href="https://gitbox.apache.org/repos/asf/qpid-broker-j.git";>Git</a> 
&#x2022; <a href="https://github.com/apache/qpid-broker-j";>GitHub</a></td>
 </tr>
 <tr>
-  <td><a href="https://github.com/apache/qpid-cpp/blob/master/README.md";>Qpid 
C++</a></td>
+  <td><a href="https://github.com/apache/qpid-cpp/blob/main/README.md";>Qpid 
C++</a></td>
   <td><a href="/releases/qpid-cpp-1.39.0">1.39.0</a></td>
   <td><a href="https://issues.apache.org/jira/projects/QPID";>Summary</a> 
&#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPID+and+resolution+is+null+and+component+in+%28%22C%2B%2B+Broker%22%2C+%22C%2B%2B+Build%22%2C+%22C%2B%2B+Client%22%2C+%22C%2B%2B+Clustering%22%2C+%22C%2B%2B+Documentation%22%2C+%22C%2B%2B+Tests%22%2C+%22C%2B%2B+Tools%22%2C+%22.NET+Client%22%2C+%22Perl+Client%22%2C+%22Python+Client+%28Wrapped%29%22%2C+%22QMF%22%2C+%22Ruby+Client%22%29";>Open
 iss [...]
-  <td><a 
href="https://builds.apache.org/blue/organizations/jenkins/Qpid%2FQpid-CPP-Test/activity";><img
 src="https://builds.apache.org/buildStatus/icon?job=Qpid/Qpid-CPP-Test"; 
height="20"/></a> <a 
href="https://ci.appveyor.com/project/ApacheSoftwareFoundation/qpid-cpp/branch/master";><img
 src="https://ci.appveyor.com/api/projects/status/wma611lkq1fcyo18?svg=true"; 
height="20"/></a></td>
+  <td><a 
href="https://builds.apache.org/blue/organizations/jenkins/Qpid%2FQpid-CPP-Test/activity";><img
 src="https://builds.apache.org/buildStatus/icon?job=Qpid/Qpid-CPP-Test"; 
height="20"/></a> <a 
href="https://ci.appveyor.com/project/ApacheSoftwareFoundation/qpid-cpp/branch/main";><img
 src="https://ci.appveyor.com/api/projects/status/wma611lkq1fcyo18?svg=true"; 
height="20"/></a></td>
   <td><a href="https://gitbox.apache.org/repos/asf/qpid-cpp.git";>Git</a> 
&#x2022; <a href="https://github.com/apache/qpid-cpp";>GitHub</a></td>
 </tr>
 <tr>
   <td><a href="/components/dispatch-router/index.html">Qpid Dispatch</a></td>
   <td><a href="/releases/qpid-dispatch-1.15.0">1.15.0</a></td>
   <td><a href="https://issues.apache.org/jira/projects/DISPATCH";>Summary</a> 
&#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+DISPATCH+and+resolution+is+null";>Open
 issues</a> &#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+DISPATCH";>All 
issues</a> &#x2022; <a 
href="https://issues.apache.org/jira/secure/CreateIssue!default.jspa?pid=12315321";>Create
 issue</a></td>
-  <td><a href="https://travis-ci.com/github/apache/qpid-dispatch";><img 
src="https://travis-ci.com/apache/qpid-dispatch.svg?branch=master"; 
height="20"/></a></td>
+  <td><a href="https://travis-ci.com/github/apache/qpid-dispatch";><img 
src="https://travis-ci.com/apache/qpid-dispatch.svg?branch=main"; 
height="20"/></a></td>
   <td><a href="https://gitbox.apache.org/repos/asf/qpid-dispatch.git";>Git</a> 
&#x2022; <a href="https://github.com/apache/qpid-dispatch";>GitHub</a></td>
 </tr>
 <tr>
@@ -171,7 +171,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
   <td><a href="/components/jms/index.html">Qpid JMS</a></td>
   <td><a href="/releases/qpid-jms-0.57.0">0.57.0</a></td>
   <td><a href="https://issues.apache.org/jira/projects/QPIDJMS";>Summary</a> 
&#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPIDJMS+and+resolution+is+null";>Open
 issues</a> &#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPIDJMS";>All 
issues</a> &#x2022; <a 
href="https://issues.apache.org/jira/secure/CreateIssue!default.jspa?pid=12314524";>Create
 issue</a></td>
-  <td><a 
href="https://builds.apache.org/blue/organizations/jenkins/Qpid%2FQpid-JMS-Test-JDK8/activity";><img
 src="https://builds.apache.org/buildStatus/icon?job=Qpid/Qpid-JMS-Test-JDK8"; 
height="20"/></a> <a href="https://travis-ci.com/github/apache/qpid-jms";><img 
src="https://travis-ci.com/apache/qpid-jms.svg?branch=master"; height="20"/></a> 
<a 
href="https://builds.apache.org/blue/organizations/jenkins/Qpid%2FQpid-JMS-Test-JDK8-Windows/activity";><img
 src="https://builds.apache.org/buildS [...]
+  <td><a 
href="https://builds.apache.org/blue/organizations/jenkins/Qpid%2FQpid-JMS-Test-JDK8/activity";><img
 src="https://builds.apache.org/buildStatus/icon?job=Qpid/Qpid-JMS-Test-JDK8"; 
height="20"/></a> <a href="https://travis-ci.com/github/apache/qpid-jms";><img 
src="https://travis-ci.com/apache/qpid-jms.svg?branch=main"; height="20"/></a> 
<a 
href="https://builds.apache.org/blue/organizations/jenkins/Qpid%2FQpid-JMS-Test-JDK8-Windows/activity";><img
 src="https://builds.apache.org/buildSta [...]
   <td><a href="https://gitbox.apache.org/repos/asf/qpid-jms.git";>Git</a> 
&#x2022; <a href="https://github.com/apache/qpid-jms";>GitHub</a></td>
 </tr>
 <tr>
@@ -185,18 +185,18 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
   <td><a href="/proton/index.html">Qpid Proton-J</a></td>
   <td><a href="/releases/qpid-proton-j-0.33.8">0.33.8</a></td>
   <td><a href="https://issues.apache.org/jira/projects/PROTON";>Summary</a> 
&#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+PROTON+and+resolution+is+null+and+component+in+%28%22proton-j%22%29";>Open
 issues</a> &#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+PROTON+and+component+in+%28%22proton-j%22%29";>All
 issues</a> &#x2022; <a 
href="https://issues.apache.org/jira/secure/CreateIssue!default.jspa?pid=12313720";>Create
 issue</a></td>
-  <td><a 
href="https://builds.apache.org/blue/organizations/jenkins/Qpid%2FQpid-Proton-J-JDK8/activity";><img
 src="https://builds.apache.org/buildStatus/icon?job=Qpid/Qpid-Proton-J-JDK8"; 
height="20"/></a> <a 
href="https://travis-ci.com/github/apache/qpid-proton-j";><img 
src="https://travis-ci.com/apache/qpid-proton-j.svg?branch=master"; 
height="20"/></a></td>
+  <td><a 
href="https://builds.apache.org/blue/organizations/jenkins/Qpid%2FQpid-Proton-J-JDK8/activity";><img
 src="https://builds.apache.org/buildStatus/icon?job=Qpid/Qpid-Proton-J-JDK8"; 
height="20"/></a> <a 
href="https://travis-ci.com/github/apache/qpid-proton-j";><img 
src="https://travis-ci.com/apache/qpid-proton-j.svg?branch=main"; 
height="20"/></a></td>
   <td><a href="https://gitbox.apache.org/repos/asf/qpid-proton-j.git";>Git</a> 
&#x2022; <a href="https://github.com/apache/qpid-proton-j";>GitHub</a></td>
 </tr>
 <tr>
   <td><a href="/proton/index.html">Qpid Proton</a></td>
   <td><a href="/releases/qpid-proton-0.33.0">0.33.0</a></td>
   <td><a href="https://issues.apache.org/jira/projects/PROTON";>Summary</a> 
&#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+PROTON+and+resolution+is+null";>Open
 issues</a> &#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+PROTON";>All 
issues</a> &#x2022; <a 
href="https://issues.apache.org/jira/secure/CreateIssue!default.jspa?pid=12313720";>Create
 issue</a></td>
-  <td><a 
href="https://builds.apache.org/blue/organizations/jenkins/Qpid%2FQpid-Proton-C/activity";><img
 src="https://builds.apache.org/buildStatus/icon?job=Qpid/Qpid-Proton-C"; 
height="20"/></a> <a 
href="https://travis-ci.com/github/apache/qpid-proton";><img 
src="https://travis-ci.com/apache/qpid-proton.svg?branch=master"; 
height="20"/></a></td>
+  <td><a 
href="https://builds.apache.org/blue/organizations/jenkins/Qpid%2FQpid-Proton-C/activity";><img
 src="https://builds.apache.org/buildStatus/icon?job=Qpid/Qpid-Proton-C"; 
height="20"/></a> <a 
href="https://travis-ci.com/github/apache/qpid-proton";><img 
src="https://travis-ci.com/apache/qpid-proton.svg?branch=main"; 
height="20"/></a></td>
   <td><a href="https://gitbox.apache.org/repos/asf/qpid-proton.git";>Git</a> 
&#x2022; <a href="https://github.com/apache/qpid-proton";>GitHub</a></td>
 </tr>
 <tr>
-  <td><a 
href="https://github.com/apache/qpid-python/blob/master/README.md";>Qpid 
Python</a></td>
+  <td><a href="https://github.com/apache/qpid-python/blob/main/README.md";>Qpid 
Python</a></td>
   <td><a href="/releases/qpid-python-1.37.0">1.37.0</a></td>
   <td><a href="https://issues.apache.org/jira/projects/QPID";>Summary</a> 
&#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPID+and+resolution+is+null+and+component+in+%28%22Python+Client%22%2C+%22Python+Examples%22%2C+%22Python+Test+Suite%22%29";>Open
 issues</a> &#x2022; <a 
href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPID+and+component+in+%28%22Python+Client%22%2C+%22Python+Examples%22%2C+%22Python+Test+Suite%22%29";>All
 issues</a> &#x2022; <a href= [...]
   <td>-</td>
@@ -277,7 +277,6 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <ul>
 <li><a href="/components/index.html">Components</a></li>
 <li><a href="/releases/index.html">Releases</a></li>
-<li><a href="/releases/snapshots.html">Doc snapshots</a></li>
 </ul>
 
 </section>
diff --git a/content/documentation.html b/content/documentation.html
index f6b3a7d..5aec94d 100644
--- a/content/documentation.html
+++ b/content/documentation.html
@@ -236,7 +236,6 @@ You can find older versions with our
 <h2 id="more-information">More information</h2>
 
 <ul>
-<li><a href="/releases/snapshots.html">Documentation snapshots</a></li>
 <li><a href="/releases/index.html">Past and current releases</a></li>
 <li><a href="/components/index.html">Components</a></li>
 </ul>
diff --git a/content/electron/index.html b/content/electron/index.html
index 8a45f26..a1eb9fb 100644
--- a/content/electron/index.html
+++ b/content/electron/index.html
@@ -115,7 +115,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 
         <div id="-middle-content">
           <p>This is not a web page, it is a Go package stub.
-<a 
href="https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/src/qpid.apache.org/README.md";>Find
 out more</a></p>
+<a 
href="https://github.com/apache/qpid-proton/blob/main/go/pkg/README.md";>Find 
out more</a></p>
 
 
           <hr/>
diff --git a/content/proton/index.html b/content/proton/index.html
index 02f6e75..965987c 100644
--- a/content/proton/index.html
+++ b/content/proton/index.html
@@ -172,7 +172,6 @@ platform, environment, or language. More about
 <li><a href="/releases/qpid-proton-0.33.0">Qpid Proton 0.33.0</a></li>
 <li><a href="/releases/qpid-proton-j-0.33.8">Qpid Proton-J 0.33.8</a></li>
 <li><a href="/releases/index.html#past-releases">Past releases</a></li>
-<li><a href="/releases/qpid-proton-master/index.html">Work in progress</a> 
</li>
 </ul>
 
 <h2 id="issues">Issues</h2>
diff --git 
a/content/releases/qpid-cpp-1.37.0/messaging-api/cpp/examples/index.html 
b/content/releases/qpid-cpp-1.37.0/messaging-api/cpp/examples/index.html
index 5d3a272..e37fe72 100644
--- a/content/releases/qpid-cpp-1.37.0/messaging-api/cpp/examples/index.html
+++ b/content/releases/qpid-cpp-1.37.0/messaging-api/cpp/examples/index.html
@@ -135,8 +135,8 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <h2 id="more-information">More information</h2>
 
 <ul>
-<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/master";>README</a></li>
-<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/master";>Source
 location</a></li>
+<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/main";>README</a></li>
+<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/main";>Source
 location</a></li>
 </ul>
 
 
diff --git 
a/content/releases/qpid-cpp-1.38.0/messaging-api/cpp/examples/index.html 
b/content/releases/qpid-cpp-1.38.0/messaging-api/cpp/examples/index.html
index 68d421c..8943a14 100644
--- a/content/releases/qpid-cpp-1.38.0/messaging-api/cpp/examples/index.html
+++ b/content/releases/qpid-cpp-1.38.0/messaging-api/cpp/examples/index.html
@@ -135,8 +135,8 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <h2 id="more-information">More information</h2>
 
 <ul>
-<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/master";>README</a></li>
-<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/master";>Source
 location</a></li>
+<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/main";>README</a></li>
+<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/main";>Source
 location</a></li>
 </ul>
 
 
diff --git 
a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/index.html 
b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/index.html
index 342755b..e787d9d 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/index.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/index.html
@@ -135,8 +135,8 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <h2 id="more-information">More information</h2>
 
 <ul>
-<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/master";>README</a></li>
-<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/master";>Source
 location</a></li>
+<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/main";>README</a></li>
+<li><a 
href="https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/main";>Source
 location</a></li>
 </ul>
 
 
diff --git a/content/releases/qpid-dispatch-1.0.0/release-notes.html 
b/content/releases/qpid-dispatch-1.0.0/release-notes.html
index 1db95ea..d8c6b99 100644
--- a/content/releases/qpid-dispatch-1.0.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.0.0/release-notes.html
@@ -158,7 +158,7 @@ documentation, see the <a href="index.html">release 
overview</a>.</p>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-430";>DISPATCH-430</a> - 
Cursor snaps way above peaks in a rate chart</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-571";>DISPATCH-571</a> - 
Driver spins when a listener accepts a socket while FDs are all in use</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-737";>DISPATCH-737</a> - 
qdstat and qdmanage always force sasl exchange</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-741";>DISPATCH-741</a> - 
Coverity scan reported errors in Qpid Dispatch master</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-741";>DISPATCH-741</a> - 
Coverity scan reported errors in Qpid Dispatch main</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-743";>DISPATCH-743</a> - 
Intermittent SSL Failure</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-747";>DISPATCH-747</a> - 
Console does not handle connection errors well</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-748";>DISPATCH-748</a> - 
Error message shown when rapidly clicking treeview on left side of hawtio 
console: Uncaught TypeError: Cannot read property 'height' of null</li>
@@ -211,7 +211,7 @@ documentation, see the <a href="index.html">release 
overview</a>.</p>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-826";>DISPATCH-826</a> - 
Specifying an invalid host on the connector crashes the router</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-829";>DISPATCH-829</a> - 
The router does not set the "aborted" indication on truncated, streamed 
deliveries</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-835";>DISPATCH-835</a> - 
The DETACH/CLOSE sequence causes a memory leak</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-837";>DISPATCH-837</a> - 
Coverity scan reported errors in Qpid Dispatch master</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-837";>DISPATCH-837</a> - 
Coverity scan reported errors in Qpid Dispatch main</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-841";>DISPATCH-841</a> - 
Decrease default limit of rows returned by qdstat from 1000 to 100</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-842";>DISPATCH-842</a> - 
Include missing license information in the LICENSE file</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-846";>DISPATCH-846</a> - 
Memory leaks in ctest with valgrind</li>
diff --git a/content/releases/qpid-dispatch-1.1.0/release-notes.html 
b/content/releases/qpid-dispatch-1.1.0/release-notes.html
index 16e241d..47ac1ba 100644
--- a/content/releases/qpid-dispatch-1.1.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.1.0/release-notes.html
@@ -175,7 +175,7 @@ since the maximum number of sessions between two containers 
is limited to 32,768
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-893";>DISPATCH-893</a> - 
Compile fails using libwebsockets 7</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-894";>DISPATCH-894</a> - 
Unable to run system tests on CentOS 6 (Python 2.6)</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-902";>DISPATCH-902</a> - 
Intermittent crash with link to broker when broker closed</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-905";>DISPATCH-905</a> - 
Dispatch Router not failing over to slave broker when master broker goes 
away</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-905";>DISPATCH-905</a> - 
Dispatch Router not failing over to backup broker when main broker goes 
away</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-907";>DISPATCH-907</a> - 
cannot set address phase via qdmanage tool</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-910";>DISPATCH-910</a> - 
Inter-router connections with dir 'in' have no host name</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-912";>DISPATCH-912</a> - 
system_tests_user_id_proxy and system_tests_policy failing</li>
@@ -190,18 +190,18 @@ since the maximum number of sessions between two 
containers is limited to 32,768
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-943";>DISPATCH-943</a> - 
segfault in remote_sasl</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-944";>DISPATCH-944</a> - 
remote_sasl plugin leaving connections open</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-945";>DISPATCH-945</a> - 
Crash on shutdown when a http+websocket connection is open</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-947";>DISPATCH-947</a> - 
system tests on master branch failing when run against latest master proton</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-947";>DISPATCH-947</a> - 
system tests on main branch failing when run against latest main proton</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-948";>DISPATCH-948</a> - 
Move rhea npm dependency from dispatch-management to stand-alone </li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-952";>DISPATCH-952</a> - 
qdrouterd seg fault after reporting "too many sessions"</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-953";>DISPATCH-953</a> - 
Relative path name self test fails unless dispatch is installed</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-954";>DISPATCH-954</a> - 
Fix Coverity issue on master branch</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-954";>DISPATCH-954</a> - 
Fix Coverity issue on main branch</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-962";>DISPATCH-962</a> - 
links established to 'unavailable' addresses are not refused correctly</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-964";>DISPATCH-964</a> - 
Auto-links are closed with an incorrect error indication</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-966";>DISPATCH-966</a> - 
Qpid dispatch unstable inter-router connections</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-967";>DISPATCH-967</a> - 
Policy management interface does not forward log warning messages</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-981";>DISPATCH-981</a> - 
link routing results in name collisions now that single session is used</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-983";>DISPATCH-983</a> - 
link routed receiver link did not issue flow</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-986";>DISPATCH-986</a> - 
Coverity issues on master</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-986";>DISPATCH-986</a> - 
Coverity issues on main</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-991";>DISPATCH-991</a> - 
Master qdstat throws keyError when running against 1.0.1 router</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-992";>DISPATCH-992</a> - 
System test is failing in some scenarios - system_tests_delivery_abort.py</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-994";>DISPATCH-994</a> - 
segfault in qdr_link_second_attach</li>
diff --git a/content/releases/qpid-dispatch-1.10.0/release-notes.html 
b/content/releases/qpid-dispatch-1.10.0/release-notes.html
index 9be8bc6..7560d0b 100644
--- a/content/releases/qpid-dispatch-1.10.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.10.0/release-notes.html
@@ -153,7 +153,7 @@ documentation, see the <a href="index.html">release 
overview</a>.</p>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1491";>DISPATCH-1491</a> - 
bottleneck adding or removing addresses in mobile address engine</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1500";>DISPATCH-1500</a> - 
inefficiencies in handling large MAU messages</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1516";>DISPATCH-1516</a> - 
Trace log the peer delivery id and link id when linking and unlinking peers</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1525";>DISPATCH-1525</a> - 
KeyError when executing master branch qdstat -l (links) against 1.9.0 router on 
Python 3</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1525";>DISPATCH-1525</a> - 
KeyError when executing main branch qdstat -l (links) against 1.9.0 router on 
Python 3</li>
 </ul>
 
 <h2 id="bugs-fixed">Bugs fixed</h2>
diff --git a/content/releases/qpid-dispatch-1.12.0/release-notes.html 
b/content/releases/qpid-dispatch-1.12.0/release-notes.html
index 83a1f26..9730e04 100644
--- a/content/releases/qpid-dispatch-1.12.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.12.0/release-notes.html
@@ -152,7 +152,7 @@ documentation, see the <a href="index.html">release 
overview</a>.</p>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1626";>DISPATCH-1626</a> - 
On released callback invoked twice for same delivery tag</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1627";>DISPATCH-1627</a> - 
Occasional leak of qd_iterator_buffer during system_tests_link_route_credit 
test</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1628";>DISPATCH-1628</a> - 
Crash after enforcing oversize message connection close</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1630";>DISPATCH-1630</a> - 
Coverity issues on master branch</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1630";>DISPATCH-1630</a> - 
Coverity issues on main branch</li>
 </ul>
 
 
diff --git a/content/releases/qpid-dispatch-1.15.0/release-notes.html 
b/content/releases/qpid-dispatch-1.15.0/release-notes.html
index 027df3c..2e80e16 100644
--- a/content/releases/qpid-dispatch-1.15.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.15.0/release-notes.html
@@ -200,11 +200,11 @@ documentation, see the <a href="index.html">release 
overview</a>.</p>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1884";>DISPATCH-1884</a> - 
TCP Adaptor fails asan leak tests</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1886";>DISPATCH-1886</a> - 
Review and fix races between connection activation and closure</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1894";>DISPATCH-1894</a> - 
Make libnghttp2 library not required</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1899";>DISPATCH-1899</a> - 
Coverity issues on master branch</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1899";>DISPATCH-1899</a> - 
Coverity issues on main branch</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1900";>DISPATCH-1900</a> - 
qd_calloc: Assertion `nmemb &amp;&amp; size' failed.</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1901";>DISPATCH-1901</a> - 
Bad configuration self test does not recognize all types of connection 
failure</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1902";>DISPATCH-1902</a> - 
qdr_link_complete_sent_message fails to update delivery work value</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1904";>DISPATCH-1904</a> - 
Compilation error on qpid-dispatch master on Fedora 32</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1904";>DISPATCH-1904</a> - 
Compilation error on qpid-dispatch main on Fedora 32</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1906";>DISPATCH-1906</a> - 
Coverity error relating to adding delivery id in trace logs</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1916";>DISPATCH-1916</a> - 
Coverity flags use-after-free errors on delivery decref</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1920";>DISPATCH-1920</a> - 
Enable TSAN tests in travis configuration</li>
diff --git a/content/releases/qpid-dispatch-1.3.0/release-notes.html 
b/content/releases/qpid-dispatch-1.3.0/release-notes.html
index 93d637e..3f6cb87 100644
--- a/content/releases/qpid-dispatch-1.3.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.3.0/release-notes.html
@@ -169,7 +169,7 @@ to resolve these test failures until a newer release of 
Dispatch is available.</
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1093";>DISPATCH-1093</a> - 
adding connectors dynamically causes extra connections for existing 
connectors</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1094";>DISPATCH-1094</a> - 
Log file messages out of order according to time stamps</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1095";>DISPATCH-1095</a> - 
Skipped system tests are marked as failed on rhel6 </li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1097";>DISPATCH-1097</a> - 
Fix Coverity issue on master branch</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1097";>DISPATCH-1097</a> - 
Fix Coverity issue on main branch</li>
 </ul>
 
 
diff --git a/content/releases/qpid-dispatch-1.5.0/release-notes.html 
b/content/releases/qpid-dispatch-1.5.0/release-notes.html
index 84c50de..7af02ea 100644
--- a/content/releases/qpid-dispatch-1.5.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.5.0/release-notes.html
@@ -174,7 +174,7 @@ protocols attribute. Users who require OpenSSL version 
restrictions must use sys
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1146";>DISPATCH-1146</a> - 
Core-endpoint can't receive deliveries on core-initiated links</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1153";>DISPATCH-1153</a> - 
Router crash when a detach arrives on a link that is processing deliveries</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1155";>DISPATCH-1155</a> - 
dueling httpRootDirs</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1163";>DISPATCH-1163</a> - 
Coverity issues on master branch </li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1163";>DISPATCH-1163</a> - 
Coverity issues on main branch </li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1164";>DISPATCH-1164</a> - 
Failing to compile the router when only python3 is installed</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1169";>DISPATCH-1169</a> - 
Remove stranded link info popup on console's topology page</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1170";>DISPATCH-1170</a> - 
System tests failing when executed on a python3 only machine</li>
diff --git a/content/releases/qpid-dispatch-1.6.0/release-notes.html 
b/content/releases/qpid-dispatch-1.6.0/release-notes.html
index 2aa4241..c222171 100644
--- a/content/releases/qpid-dispatch-1.6.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.6.0/release-notes.html
@@ -163,7 +163,7 @@ documentation, see the <a href="index.html">release 
overview</a>.</p>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1285";>DISPATCH-1285</a> - 
Router crashes occasionally on system_tests_delivery_abort</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1287";>DISPATCH-1287</a> - 
router gets confused by clients response to drain and subsequently issue too 
little credit</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1288";>DISPATCH-1288</a> - 
Optionally enforce access policy on connections established by the router</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1292";>DISPATCH-1292</a> - 
Coverity issues on master branch</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1292";>DISPATCH-1292</a> - 
Coverity issues on main branch</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1293";>DISPATCH-1293</a> - 
Show traffic for stand-alone router</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1297";>DISPATCH-1297</a> - 
Fix buffer reference counting for multiframe fanout messages</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1301";>DISPATCH-1301</a> - 
Management messages lost</li>
@@ -172,7 +172,7 @@ documentation, see the <a href="index.html">release 
overview</a>.</p>
 <h2 id="tasks">Tasks</h2>
 
 <ul>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1115";>DISPATCH-1115</a> - 
Configure Travis to run Dispatch tests agianst the latest Proton release and 
Proton master branch</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1115";>DISPATCH-1115</a> - 
Configure Travis to run Dispatch tests agianst the latest Proton release and 
Proton main branch</li>
 </ul>
 
 
diff --git a/content/releases/qpid-dispatch-1.7.0/release-notes.html 
b/content/releases/qpid-dispatch-1.7.0/release-notes.html
index 6218aa9..fdfe701 100644
--- a/content/releases/qpid-dispatch-1.7.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.7.0/release-notes.html
@@ -141,7 +141,7 @@ documentation, see the <a href="index.html">release 
overview</a>.</p>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1314";>DISPATCH-1314</a> - 
spurious error in log when using healthz or metrics</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1315";>DISPATCH-1315</a> - 
attempt to wake a deleted http connection</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1316";>DISPATCH-1316</a> - 
race in remote_sasl can cause use after free</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1319";>DISPATCH-1319</a> - 
Coverity issues on master branch</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1319";>DISPATCH-1319</a> - 
Coverity issues on main branch</li>
 </ul>
 
 
diff --git a/content/releases/qpid-dispatch-1.9.0/release-notes.html 
b/content/releases/qpid-dispatch-1.9.0/release-notes.html
index 16795c7..08f3a53 100644
--- a/content/releases/qpid-dispatch-1.9.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.9.0/release-notes.html
@@ -158,7 +158,7 @@ documentation, see the <a href="index.html">release 
overview</a>.</p>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1378";>DISPATCH-1378</a> - 
missing lock of connection's links_with_work list</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1380";>DISPATCH-1380</a> - 
qdrouterd leaves dangling qd_link_t pointer</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1383";>DISPATCH-1383</a> - 
system_tests_policy is timing out</li>
-<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1387";>DISPATCH-1387</a> - 
Coverity issues on master branch</li>
+<li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1387";>DISPATCH-1387</a> - 
Coverity issues on main branch</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1391";>DISPATCH-1391</a> - 
Proton link reference not cleared on router link objects during session 
close</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1394";>DISPATCH-1394</a> - 
qd_check_message() incorrectly validates partially received messages</li>
 <li><a 
href="https://issues.apache.org/jira/browse/DISPATCH-1398";>DISPATCH-1398</a> - 
"Expression with no effect" warning for console web</li>
diff --git a/content/releases/qpid-proton-0.29.0/release-notes.html 
b/content/releases/qpid-proton-0.29.0/release-notes.html
index e080667..eb58ff1 100644
--- a/content/releases/qpid-proton-0.29.0/release-notes.html
+++ b/content/releases/qpid-proton-0.29.0/release-notes.html
@@ -144,7 +144,7 @@ documentation, see the <a href="index.html">release 
overview</a>.</p>
 <li><a 
href="https://issues.apache.org/jira/browse/PROTON-2067";>PROTON-2067</a> - 
Enable linktime optimization by default</li>
 <li><a 
href="https://issues.apache.org/jira/browse/PROTON-2073";>PROTON-2073</a> - 
Travis CI build test fails on Ubuntu 1604</li>
 <li><a 
href="https://issues.apache.org/jira/browse/PROTON-2074";>PROTON-2074</a> - 
Using a connection url with characters that need to be urlencoded can cause a 
hang</li>
-<li><a 
href="https://issues.apache.org/jira/browse/PROTON-2079";>PROTON-2079</a> - 
Coverity issues related to printf on master branch</li>
+<li><a 
href="https://issues.apache.org/jira/browse/PROTON-2079";>PROTON-2079</a> - 
Coverity issues related to printf on main branch</li>
 <li><a 
href="https://issues.apache.org/jira/browse/PROTON-2081";>PROTON-2081</a> - Hang 
in Windows proactor during connect</li>
 <li><a 
href="https://issues.apache.org/jira/browse/PROTON-2087";>PROTON-2087</a> - 
[Python] Detection of tox caches failure instaead of trying again if not 
initially found</li>
 <li><a 
href="https://issues.apache.org/jira/browse/PROTON-2088";>PROTON-2088</a> - 
[Python] Changing a python file and building does not ensure the changed file 
ends up in the installable</li>
diff --git a/input/_transom_config.py b/input/_transom_config.py
index 61874f0..e71cb21 100644
--- a/input/_transom_config.py
+++ b/input/_transom_config.py
@@ -114,7 +114,7 @@ def dashboard_asf_git_links(repo_key):
 
     return " &#x2022; ".join(links)
 
-def appveyor_ci_badge(party_key, job_key, badge_key, branch="master"):
+def appveyor_ci_badge(party_key, job_key, badge_key, branch="main"):
     job_url = 
"https://ci.appveyor.com/project/{}/{}/branch/{}".format(party_key, job_key, 
branch)
     image_url = 
"https://ci.appveyor.com/api/projects/status/{}?svg=true".format(badge_key)
 
@@ -126,13 +126,13 @@ def asf_jenkins_badge(job_key):
 
     return "<a href=\"{}\"><img src=\"{}\" 
height=\"20\"/></a>".format(job_url, image_url)
 
-def asf_jenkins_pipeline_badge(job_key, branch="master"):
+def asf_jenkins_pipeline_badge(job_key, branch="main"):
     job_url = 
"https://builds.apache.org/blue/organizations/jenkins/Qpid%2F{}/activity".format(job_key)
     image_url = 
"https://builds.apache.org/buildStatus/icon?job=Qpid/{}/{}".format(job_key, 
branch)
 
     return "<a href=\"{}\"><img src=\"{}\" 
height=\"20\"/></a>".format(job_url, image_url)
 
-def travis_ci_badge(party_key, job_key, branch="master"):
+def travis_ci_badge(party_key, job_key, branch="main"):
     job_url = "https://travis-ci.com/github/{}/{}".format(party_key, job_key)
     image_url = "https://travis-ci.com/{}/{}.svg?branch={}".format(party_key, 
job_key, branch)
 
diff --git a/input/components/broker-j/index.md 
b/input/components/broker-j/index.md
index a9be087..0e095ea 100644
--- a/input/components/broker-j/index.md
+++ b/input/components/broker-j/index.md
@@ -61,7 +61,7 @@ that stores, routes, and forwards messages using AMQP.
 ## Documentation
 
  - [Broker book]({{current_broker_j_release_url}}/book/index.html)
- - [How to build Apache Qpid 
Broker-J](https://github.com/apache/qpid-broker-j/blob/master/README.md)
+ - [How to build Apache Qpid 
Broker-J](https://github.com/apache/qpid-broker-j/blob/main/README.md)
 
 </div>
 
diff --git a/input/components/cpp-broker/index.md 
b/input/components/cpp-broker/index.md
index 9c47003..6b11060 100644
--- a/input/components/cpp-broker/index.md
+++ b/input/components/cpp-broker/index.md
@@ -63,7 +63,7 @@ that stores, routes, and forwards messages using AMQP.
 
  - [C++ broker book]({{current_cpp_release_url}}/cpp-broker/book/index.html)
  - [Managing the C++ 
broker]({{current_cpp_release_url}}/cpp-broker/book/chapter-Managing-CPP-Broker.html#section-Managing-CPP-Broker)
- - [Installing Qpid 
C++](https://raw.githubusercontent.com/apache/qpid-cpp/master/INSTALL.txt)
+ - [Installing Qpid 
C++](https://raw.githubusercontent.com/apache/qpid-cpp/main/INSTALL.txt)
  - [Qpid extensions to 
AMQP](https://cwiki.apache.org/confluence/display/qpid/qpid+extensions+to+amqp)
 
 </div>
diff --git a/input/components/messaging-api/index.md 
b/input/components/messaging-api/index.md
index 75f057b..88e1371 100644
--- a/input/components/messaging-api/index.md
+++ b/input/components/messaging-api/index.md
@@ -43,8 +43,8 @@ find previous versions with our
  - [C++ 
examples]({{current_cpp_release_url}}/messaging-api/cpp/examples/index.html)
  - [Python API 
reference]({{current_python_release_url}}/messaging-api/api/index.html)
  - [Python 
examples]({{current_python_release_url}}/messaging-api/examples/index.html)
- - [Installing Qpid 
C++](https://raw.githubusercontent.com/apache/qpid-cpp/master/INSTALL.txt)
- - [Installing Qpid 
Python](https://raw.githubusercontent.com/apache/qpid-python/master/README.md)
+ - [Installing Qpid 
C++](https://raw.githubusercontent.com/apache/qpid-cpp/main/INSTALL.txt)
+ - [Installing Qpid 
Python](https://raw.githubusercontent.com/apache/qpid-python/main/README.md)
 
 </div>
 
diff --git a/input/dashboard.md b/input/dashboard.md
index e730f9a..c87bc72 100644
--- a/input/dashboard.md
+++ b/input/dashboard.md
@@ -34,14 +34,14 @@
 | Module | Release | Issues | Tests | Source code |
 | ------ | ------- | ------ | ----- | ----------- |
 | [Qpid Broker-J]({{site_url}}/components/broker-j/index.html)               | 
{{broker_j_release.brief_link}} | {{dashboard_asf_jira_links("QPID", 12310520, 
["Broker-J", "Java Build", "Java Documentation", "Java Performance Tests", 
"Java Tests", "Java Tools"])}} | {{travis_ci_badge("apache", "qpid-broker-j")}} 
 | {{dashboard_asf_git_links("qpid-broker-j")}} |
-| [Qpid C++](https://github.com/apache/qpid-cpp/blob/master/README.md)       | 
{{cpp_release.brief_link}} | {{dashboard_asf_jira_links("QPID", 12310520, ["C++ 
Broker", "C++ Build", "C++ Client", "C++ Clustering", "C++ Documentation", "C++ 
Tests", "C++ Tools", ".NET Client", "Perl Client", "Python Client (Wrapped)", 
"QMF", "Ruby Client"])}} | {{asf_jenkins_badge("Qpid-CPP-Test")}} 
{{appveyor_ci_badge("ApacheSoftwareFoundation", "qpid-cpp", 
"wma611lkq1fcyo18")}} | {{dashboard_asf_git_links [...]
+| [Qpid C++](https://github.com/apache/qpid-cpp/blob/main/README.md)       | 
{{cpp_release.brief_link}} | {{dashboard_asf_jira_links("QPID", 12310520, ["C++ 
Broker", "C++ Build", "C++ Client", "C++ Clustering", "C++ Documentation", "C++ 
Tests", "C++ Tools", ".NET Client", "Perl Client", "Python Client (Wrapped)", 
"QMF", "Ruby Client"])}} | {{asf_jenkins_badge("Qpid-CPP-Test")}} 
{{appveyor_ci_badge("ApacheSoftwareFoundation", "qpid-cpp", 
"wma611lkq1fcyo18")}} | {{dashboard_asf_git_links(" [...]
 | [Qpid Dispatch]({{site_url}}/components/dispatch-router/index.html)        | 
{{dispatch_release.brief_link}} | {{dashboard_asf_jira_links("DISPATCH", 
12315321)}} | {{travis_ci_badge("apache", "qpid-dispatch")}} | 
{{dashboard_asf_git_links("qpid-dispatch")}} |
 | [Qpid Interop Test]({{site_url}}/components/interop-test/index.html)       | 
{{interop_test_release.brief_link}} | {{dashboard_asf_jira_links("QPIDIT", 
12318621)}} | - | {{dashboard_asf_git_links("qpid-interop-test")}} |
 | [Qpid JMS]({{site_url}}/components/jms/index.html)                         | 
{{jms_release.brief_link}} | {{dashboard_asf_jira_links("QPIDJMS", 12314524)}} 
| {{asf_jenkins_badge("Qpid-JMS-Test-JDK8")}} {{travis_ci_badge("apache", 
"qpid-jms")}} {{asf_jenkins_badge("Qpid-JMS-Test-JDK8-Windows")}} | 
{{dashboard_asf_git_links("qpid-jms")}} |
 | [Qpid JMS AMQP 0-x]({{site_url}}/components/jms/amqp-0-x.html)             | 
{{jms_amqp_0_x_release.brief_link}} | {{dashboard_asf_jira_links("QPID", 
12310520, ["JMS AMQP 0-x"])}} | <a 
href="https://builds.apache.org/job/Qpid/job/Qpid-JMS-AMQP-0-x-Broker-J-TestMatrix";><img
 
src="https://builds.apache.org/buildStatus/icon?job=Qpid/Qpid-JMS-AMQP-0-x-Broker-J-TestMatrix";
 height="20"/></a> | {{dashboard_asf_git_links("qpid-jms-amqp-0-x")}} |
 | [Qpid Proton-J]({{site_url}}/proton/index.html)                            | 
{{proton_j_release.brief_link}} | {{dashboard_asf_jira_links("PROTON", 
12313720, ["proton-j"])}} | {{asf_jenkins_badge("Qpid-Proton-J-JDK8")}} 
{{travis_ci_badge("apache", "qpid-proton-j")}} | 
{{dashboard_asf_git_links("qpid-proton-j")}} |
 | [Qpid Proton]({{site_url}}/proton/index.html)                              | 
{{proton_release.brief_link}} | {{dashboard_asf_jira_links("PROTON", 
12313720)}} | {{asf_jenkins_badge("Qpid-Proton-C")}} 
{{travis_ci_badge("apache", "qpid-proton")}} | 
{{dashboard_asf_git_links("qpid-proton")}} |
-| [Qpid Python](https://github.com/apache/qpid-python/blob/master/README.md) | 
{{python_release.brief_link}} | {{dashboard_asf_jira_links("QPID", 12310520, 
["Python Client", "Python Examples", "Python Test Suite"])}} | - | 
{{dashboard_asf_git_links("qpid-python")}} |
+| [Qpid Python](https://github.com/apache/qpid-python/blob/main/README.md) | 
{{python_release.brief_link}} | {{dashboard_asf_jira_links("QPID", 12310520, 
["Python Client", "Python Examples", "Python Test Suite"])}} | - | 
{{dashboard_asf_git_links("qpid-python")}} |
 | [Qpid Site](https://github.com/apache/qpid-site/blob/asf-site/README.md)   | 
- | {{dashboard_asf_jira_links("QPID", 12310520, ["Website"])}} | 
{{travis_ci_badge("apache", "qpid-site", "asf-site")}} | 
{{dashboard_asf_git_links("qpid-site")}} |
 
 </div>
diff --git a/input/electron/index.md b/input/electron/index.md
index 69e7ad1..f2de2df 100644
--- a/input/electron/index.md
+++ b/input/electron/index.md
@@ -1,2 +1,2 @@
 This is not a web page, it is a Go package stub.
-[Find out 
more](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/src/qpid.apache.org/README.md)
+[Find out 
more](https://github.com/apache/qpid-proton/blob/main/go/pkg/README.md)
diff --git a/input/releases/qpid-cpp-1.37.0/messaging-api/cpp/examples/index.md 
b/input/releases/qpid-cpp-1.37.0/messaging-api/cpp/examples/index.md
index 12db7f5..f1b394b 100644
--- a/input/releases/qpid-cpp-1.37.0/messaging-api/cpp/examples/index.md
+++ b/input/releases/qpid-cpp-1.37.0/messaging-api/cpp/examples/index.md
@@ -17,5 +17,5 @@
 
 ## More information
 
- - 
[README](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/master)
- - [Source 
location](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/master)
+ - 
[README](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/main)
+ - [Source 
location](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/main)
diff --git a/input/releases/qpid-cpp-1.38.0/messaging-api/cpp/examples/index.md 
b/input/releases/qpid-cpp-1.38.0/messaging-api/cpp/examples/index.md
index 12db7f5..f1b394b 100644
--- a/input/releases/qpid-cpp-1.38.0/messaging-api/cpp/examples/index.md
+++ b/input/releases/qpid-cpp-1.38.0/messaging-api/cpp/examples/index.md
@@ -17,5 +17,5 @@
 
 ## More information
 
- - 
[README](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/master)
- - [Source 
location](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/master)
+ - 
[README](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/main)
+ - [Source 
location](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/main)
diff --git a/input/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/index.md 
b/input/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/index.md
index 12db7f5..f1b394b 100644
--- a/input/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/index.md
+++ b/input/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/index.md
@@ -17,5 +17,5 @@
 
 ## More information
 
- - 
[README](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/master)
- - [Source 
location](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/master)
+ - 
[README](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/main)
+ - [Source 
location](https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/main)
diff --git a/input/releases/qpid-dispatch-1.0.0/release-notes.md 
b/input/releases/qpid-dispatch-1.0.0/release-notes.md
index c73b980..a3a0432 100644
--- a/input/releases/qpid-dispatch-1.0.0/release-notes.md
+++ b/input/releases/qpid-dispatch-1.0.0/release-notes.md
@@ -59,7 +59,7 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-430](https://issues.apache.org/jira/browse/DISPATCH-430) - Cursor 
snaps way above peaks in a rate chart
  - [DISPATCH-571](https://issues.apache.org/jira/browse/DISPATCH-571) - Driver 
spins when a listener accepts a socket while FDs are all in use
  - [DISPATCH-737](https://issues.apache.org/jira/browse/DISPATCH-737) - qdstat 
and qdmanage always force sasl exchange
- - [DISPATCH-741](https://issues.apache.org/jira/browse/DISPATCH-741) - 
Coverity scan reported errors in Qpid Dispatch master
+ - [DISPATCH-741](https://issues.apache.org/jira/browse/DISPATCH-741) - 
Coverity scan reported errors in Qpid Dispatch main
  - [DISPATCH-743](https://issues.apache.org/jira/browse/DISPATCH-743) - 
Intermittent SSL Failure
  - [DISPATCH-747](https://issues.apache.org/jira/browse/DISPATCH-747) - 
Console does not handle connection errors well
  - [DISPATCH-748](https://issues.apache.org/jira/browse/DISPATCH-748) - Error 
message shown when rapidly clicking treeview on left side of hawtio console: 
Uncaught TypeError: Cannot read property 'height' of null
@@ -112,7 +112,7 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-826](https://issues.apache.org/jira/browse/DISPATCH-826) - 
Specifying an invalid host on the connector crashes the router
  - [DISPATCH-829](https://issues.apache.org/jira/browse/DISPATCH-829) - The 
router does not set the "aborted" indication on truncated, streamed deliveries
  - [DISPATCH-835](https://issues.apache.org/jira/browse/DISPATCH-835) - The 
DETACH/CLOSE sequence causes a memory leak
- - [DISPATCH-837](https://issues.apache.org/jira/browse/DISPATCH-837) - 
Coverity scan reported errors in Qpid Dispatch master
+ - [DISPATCH-837](https://issues.apache.org/jira/browse/DISPATCH-837) - 
Coverity scan reported errors in Qpid Dispatch main
  - [DISPATCH-841](https://issues.apache.org/jira/browse/DISPATCH-841) - 
Decrease default limit of rows returned by qdstat from 1000 to 100
  - [DISPATCH-842](https://issues.apache.org/jira/browse/DISPATCH-842) - 
Include missing license information in the LICENSE file
  - [DISPATCH-846](https://issues.apache.org/jira/browse/DISPATCH-846) - Memory 
leaks in ctest with valgrind
@@ -130,4 +130,4 @@ documentation, see the [release overview](index.html).
 ## Tasks
 
  - [DISPATCH-812](https://issues.apache.org/jira/browse/DISPATCH-812) - Remove 
the console stress test directories
- - [DISPATCH-832](https://issues.apache.org/jira/browse/DISPATCH-832) - Ensure 
the hawtio and stand-alone consoles work with deprecated entities removed
\ No newline at end of file
+ - [DISPATCH-832](https://issues.apache.org/jira/browse/DISPATCH-832) - Ensure 
the hawtio and stand-alone consoles work with deprecated entities removed
diff --git a/input/releases/qpid-dispatch-1.1.0/release-notes.md 
b/input/releases/qpid-dispatch-1.1.0/release-notes.md
index da750bc..918dc14 100644
--- a/input/releases/qpid-dispatch-1.1.0/release-notes.md
+++ b/input/releases/qpid-dispatch-1.1.0/release-notes.md
@@ -76,7 +76,7 @@ since the maximum number of sessions between two containers 
is limited to 32,768
  - [DISPATCH-893](https://issues.apache.org/jira/browse/DISPATCH-893) - 
Compile fails using libwebsockets 7
  - [DISPATCH-894](https://issues.apache.org/jira/browse/DISPATCH-894) - Unable 
to run system tests on CentOS 6 (Python 2.6)
  - [DISPATCH-902](https://issues.apache.org/jira/browse/DISPATCH-902) - 
Intermittent crash with link to broker when broker closed
- - [DISPATCH-905](https://issues.apache.org/jira/browse/DISPATCH-905) - 
Dispatch Router not failing over to slave broker when master broker goes away
+ - [DISPATCH-905](https://issues.apache.org/jira/browse/DISPATCH-905) - 
Dispatch Router not failing over to backup broker when main broker goes away
  - [DISPATCH-907](https://issues.apache.org/jira/browse/DISPATCH-907) - cannot 
set address phase via qdmanage tool
  - [DISPATCH-910](https://issues.apache.org/jira/browse/DISPATCH-910) - 
Inter-router connections with dir 'in' have no host name
  - [DISPATCH-912](https://issues.apache.org/jira/browse/DISPATCH-912) - 
system_tests_user_id_proxy and system_tests_policy failing
@@ -91,18 +91,18 @@ since the maximum number of sessions between two containers 
is limited to 32,768
  - [DISPATCH-943](https://issues.apache.org/jira/browse/DISPATCH-943) - 
segfault in remote_sasl
  - [DISPATCH-944](https://issues.apache.org/jira/browse/DISPATCH-944) - 
remote_sasl plugin leaving connections open
  - [DISPATCH-945](https://issues.apache.org/jira/browse/DISPATCH-945) - Crash 
on shutdown when a http+websocket connection is open
- - [DISPATCH-947](https://issues.apache.org/jira/browse/DISPATCH-947) - system 
tests on master branch failing when run against latest master proton
+ - [DISPATCH-947](https://issues.apache.org/jira/browse/DISPATCH-947) - system 
tests on main branch failing when run against latest main proton
  - [DISPATCH-948](https://issues.apache.org/jira/browse/DISPATCH-948) - Move 
rhea npm dependency from dispatch-management to stand-alone 
  - [DISPATCH-952](https://issues.apache.org/jira/browse/DISPATCH-952) - 
qdrouterd seg fault after reporting "too many sessions"
  - [DISPATCH-953](https://issues.apache.org/jira/browse/DISPATCH-953) - 
Relative path name self test fails unless dispatch is installed
- - [DISPATCH-954](https://issues.apache.org/jira/browse/DISPATCH-954) - Fix 
Coverity issue on master branch
+ - [DISPATCH-954](https://issues.apache.org/jira/browse/DISPATCH-954) - Fix 
Coverity issue on main branch
  - [DISPATCH-962](https://issues.apache.org/jira/browse/DISPATCH-962) - links 
established to 'unavailable' addresses are not refused correctly
  - [DISPATCH-964](https://issues.apache.org/jira/browse/DISPATCH-964) - 
Auto-links are closed with an incorrect error indication
  - [DISPATCH-966](https://issues.apache.org/jira/browse/DISPATCH-966) - Qpid 
dispatch unstable inter-router connections
  - [DISPATCH-967](https://issues.apache.org/jira/browse/DISPATCH-967) - Policy 
management interface does not forward log warning messages
  - [DISPATCH-981](https://issues.apache.org/jira/browse/DISPATCH-981) - link 
routing results in name collisions now that single session is used
  - [DISPATCH-983](https://issues.apache.org/jira/browse/DISPATCH-983) - link 
routed receiver link did not issue flow
- - [DISPATCH-986](https://issues.apache.org/jira/browse/DISPATCH-986) - 
Coverity issues on master
+ - [DISPATCH-986](https://issues.apache.org/jira/browse/DISPATCH-986) - 
Coverity issues on main
  - [DISPATCH-991](https://issues.apache.org/jira/browse/DISPATCH-991) - Master 
qdstat throws keyError when running against 1.0.1 router
  - [DISPATCH-992](https://issues.apache.org/jira/browse/DISPATCH-992) - System 
test is failing in some scenarios - system_tests_delivery_abort.py
  - [DISPATCH-994](https://issues.apache.org/jira/browse/DISPATCH-994) - 
segfault in qdr_link_second_attach
@@ -116,4 +116,4 @@ since the maximum number of sessions between two containers 
is limited to 32,768
  - [DISPATCH-862](https://issues.apache.org/jira/browse/DISPATCH-862) - have 
the CI build log detal which commit is being used from the Proton repo
  - [DISPATCH-955](https://issues.apache.org/jira/browse/DISPATCH-955) - Assure 
console works with updated schema attribute names 
  - [DISPATCH-978](https://issues.apache.org/jira/browse/DISPATCH-978) - Audit 
memory allocations to remove cases of uninitialized data
- - [DISPATCH-989](https://issues.apache.org/jira/browse/DISPATCH-989) - remove 
defunct/broken test tool for console
\ No newline at end of file
+ - [DISPATCH-989](https://issues.apache.org/jira/browse/DISPATCH-989) - remove 
defunct/broken test tool for console
diff --git a/input/releases/qpid-dispatch-1.10.0/release-notes.md 
b/input/releases/qpid-dispatch-1.10.0/release-notes.md
index f2f6854..49fcb55 100644
--- a/input/releases/qpid-dispatch-1.10.0/release-notes.md
+++ b/input/releases/qpid-dispatch-1.10.0/release-notes.md
@@ -56,7 +56,7 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-1491](https://issues.apache.org/jira/browse/DISPATCH-1491) - 
bottleneck adding or removing addresses in mobile address engine
  - [DISPATCH-1500](https://issues.apache.org/jira/browse/DISPATCH-1500) - 
inefficiencies in handling large MAU messages
  - [DISPATCH-1516](https://issues.apache.org/jira/browse/DISPATCH-1516) - 
Trace log the peer delivery id and link id when linking and unlinking peers
- - [DISPATCH-1525](https://issues.apache.org/jira/browse/DISPATCH-1525) - 
KeyError when executing master branch qdstat -l (links) against 1.9.0 router on 
Python 3
+ - [DISPATCH-1525](https://issues.apache.org/jira/browse/DISPATCH-1525) - 
KeyError when executing main branch qdstat -l (links) against 1.9.0 router on 
Python 3
 
 ## Bugs fixed
 
@@ -93,4 +93,4 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-1512](https://issues.apache.org/jira/browse/DISPATCH-1512) - 
python checker failing due to wrong variable name
  - [DISPATCH-1514](https://issues.apache.org/jira/browse/DISPATCH-1514) - 
Dynamically turning on trace logging via qdmanage does not turn proton frame 
tracing on existing connections
  - [DISPATCH-1517](https://issues.apache.org/jira/browse/DISPATCH-1517) - 
delivery count is not incremented for undeliverable messages
- - [DISPATCH-1521](https://issues.apache.org/jira/browse/DISPATCH-1521) - 
qdstat man page -l column header for "dev" is wrong
\ No newline at end of file
+ - [DISPATCH-1521](https://issues.apache.org/jira/browse/DISPATCH-1521) - 
qdstat man page -l column header for "dev" is wrong
diff --git a/input/releases/qpid-dispatch-1.12.0/release-notes.md 
b/input/releases/qpid-dispatch-1.12.0/release-notes.md
index 6c25ee8..e4a9601 100644
--- a/input/releases/qpid-dispatch-1.12.0/release-notes.md
+++ b/input/releases/qpid-dispatch-1.12.0/release-notes.md
@@ -53,4 +53,4 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-1626](https://issues.apache.org/jira/browse/DISPATCH-1626) - On 
released callback invoked twice for same delivery tag
  - [DISPATCH-1627](https://issues.apache.org/jira/browse/DISPATCH-1627) - 
Occasional leak of qd_iterator_buffer during system_tests_link_route_credit test
  - [DISPATCH-1628](https://issues.apache.org/jira/browse/DISPATCH-1628) - 
Crash after enforcing oversize message connection close
- - [DISPATCH-1630](https://issues.apache.org/jira/browse/DISPATCH-1630) - 
Coverity issues on master branch
\ No newline at end of file
+ - [DISPATCH-1630](https://issues.apache.org/jira/browse/DISPATCH-1630) - 
Coverity issues on main branch
diff --git a/input/releases/qpid-dispatch-1.15.0/release-notes.md 
b/input/releases/qpid-dispatch-1.15.0/release-notes.md
index 76fcb8e..ac27f2e 100644
--- a/input/releases/qpid-dispatch-1.15.0/release-notes.md
+++ b/input/releases/qpid-dispatch-1.15.0/release-notes.md
@@ -101,11 +101,11 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-1884](https://issues.apache.org/jira/browse/DISPATCH-1884) - TCP 
Adaptor fails asan leak tests
  - [DISPATCH-1886](https://issues.apache.org/jira/browse/DISPATCH-1886) - 
Review and fix races between connection activation and closure
  - [DISPATCH-1894](https://issues.apache.org/jira/browse/DISPATCH-1894) - Make 
libnghttp2 library not required
- - [DISPATCH-1899](https://issues.apache.org/jira/browse/DISPATCH-1899) - 
Coverity issues on master branch
+ - [DISPATCH-1899](https://issues.apache.org/jira/browse/DISPATCH-1899) - 
Coverity issues on main branch
  - [DISPATCH-1900](https://issues.apache.org/jira/browse/DISPATCH-1900) - 
qd_calloc: Assertion `nmemb &amp;&amp; size' failed.
  - [DISPATCH-1901](https://issues.apache.org/jira/browse/DISPATCH-1901) - Bad 
configuration self test does not recognize all types of connection failure
  - [DISPATCH-1902](https://issues.apache.org/jira/browse/DISPATCH-1902) - 
qdr_link_complete_sent_message fails to update delivery work value
- - [DISPATCH-1904](https://issues.apache.org/jira/browse/DISPATCH-1904) - 
Compilation error on qpid-dispatch master on Fedora 32
+ - [DISPATCH-1904](https://issues.apache.org/jira/browse/DISPATCH-1904) - 
Compilation error on qpid-dispatch main on Fedora 32
  - [DISPATCH-1906](https://issues.apache.org/jira/browse/DISPATCH-1906) - 
Coverity error relating to adding delivery id in trace logs
  - [DISPATCH-1916](https://issues.apache.org/jira/browse/DISPATCH-1916) - 
Coverity flags use-after-free errors on delivery decref
  - [DISPATCH-1920](https://issues.apache.org/jira/browse/DISPATCH-1920) - 
Enable TSAN tests in travis configuration
@@ -118,4 +118,4 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-1946](https://issues.apache.org/jira/browse/DISPATCH-1946) - 
[docker] Schema compile fails in ubuntu xenial container
  - [DISPATCH-1950](https://issues.apache.org/jira/browse/DISPATCH-1950) - 
Knock down the minimum required version of the nghttp2 library to 1.33.0
  - [DISPATCH-1951](https://issues.apache.org/jira/browse/DISPATCH-1951) - 
system_tests_http2 failing with router crash
- - [DISPATCH-1952](https://issues.apache.org/jira/browse/DISPATCH-1952) - 
qd_bitmask_t leak on streaming message arrival
\ No newline at end of file
+ - [DISPATCH-1952](https://issues.apache.org/jira/browse/DISPATCH-1952) - 
qd_bitmask_t leak on streaming message arrival
diff --git a/input/releases/qpid-dispatch-1.3.0/release-notes.md 
b/input/releases/qpid-dispatch-1.3.0/release-notes.md
index 7d6f311..92fd1e2 100644
--- a/input/releases/qpid-dispatch-1.3.0/release-notes.md
+++ b/input/releases/qpid-dispatch-1.3.0/release-notes.md
@@ -69,4 +69,4 @@ to resolve these test failures until a newer release of 
Dispatch is available.
  - [DISPATCH-1093](https://issues.apache.org/jira/browse/DISPATCH-1093) - 
adding connectors dynamically causes extra connections for existing connectors
  - [DISPATCH-1094](https://issues.apache.org/jira/browse/DISPATCH-1094) - Log 
file messages out of order according to time stamps
  - [DISPATCH-1095](https://issues.apache.org/jira/browse/DISPATCH-1095) - 
Skipped system tests are marked as failed on rhel6 
- - [DISPATCH-1097](https://issues.apache.org/jira/browse/DISPATCH-1097) - Fix 
Coverity issue on master branch
+ - [DISPATCH-1097](https://issues.apache.org/jira/browse/DISPATCH-1097) - Fix 
Coverity issue on main branch
diff --git a/input/releases/qpid-dispatch-1.5.0/release-notes.md 
b/input/releases/qpid-dispatch-1.5.0/release-notes.md
index c8169d1..926e926 100644
--- a/input/releases/qpid-dispatch-1.5.0/release-notes.md
+++ b/input/releases/qpid-dispatch-1.5.0/release-notes.md
@@ -75,7 +75,7 @@ protocols attribute. Users who require OpenSSL version 
restrictions must use sys
  - [DISPATCH-1146](https://issues.apache.org/jira/browse/DISPATCH-1146) - 
Core-endpoint can't receive deliveries on core-initiated links
  - [DISPATCH-1153](https://issues.apache.org/jira/browse/DISPATCH-1153) - 
Router crash when a detach arrives on a link that is processing deliveries
  - [DISPATCH-1155](https://issues.apache.org/jira/browse/DISPATCH-1155) - 
dueling httpRootDirs
- - [DISPATCH-1163](https://issues.apache.org/jira/browse/DISPATCH-1163) - 
Coverity issues on master branch 
+ - [DISPATCH-1163](https://issues.apache.org/jira/browse/DISPATCH-1163) - 
Coverity issues on main branch 
  - [DISPATCH-1164](https://issues.apache.org/jira/browse/DISPATCH-1164) - 
Failing to compile the router when only python3 is installed
  - [DISPATCH-1169](https://issues.apache.org/jira/browse/DISPATCH-1169) - 
Remove stranded link info popup on console's topology page
  - [DISPATCH-1170](https://issues.apache.org/jira/browse/DISPATCH-1170) - 
System tests failing when executed on a python3 only machine
diff --git a/input/releases/qpid-dispatch-1.6.0/release-notes.md 
b/input/releases/qpid-dispatch-1.6.0/release-notes.md
index 73b9a88..b08a23a 100644
--- a/input/releases/qpid-dispatch-1.6.0/release-notes.md
+++ b/input/releases/qpid-dispatch-1.6.0/release-notes.md
@@ -64,11 +64,11 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-1285](https://issues.apache.org/jira/browse/DISPATCH-1285) - 
Router crashes occasionally on system_tests_delivery_abort
  - [DISPATCH-1287](https://issues.apache.org/jira/browse/DISPATCH-1287) - 
router gets confused by clients response to drain and subsequently issue too 
little credit
  - [DISPATCH-1288](https://issues.apache.org/jira/browse/DISPATCH-1288) - 
Optionally enforce access policy on connections established by the router
- - [DISPATCH-1292](https://issues.apache.org/jira/browse/DISPATCH-1292) - 
Coverity issues on master branch
+ - [DISPATCH-1292](https://issues.apache.org/jira/browse/DISPATCH-1292) - 
Coverity issues on main branch
  - [DISPATCH-1293](https://issues.apache.org/jira/browse/DISPATCH-1293) - Show 
traffic for stand-alone router
  - [DISPATCH-1297](https://issues.apache.org/jira/browse/DISPATCH-1297) - Fix 
buffer reference counting for multiframe fanout messages
  - [DISPATCH-1301](https://issues.apache.org/jira/browse/DISPATCH-1301) - 
Management messages lost
 
 ## Tasks
 
- - [DISPATCH-1115](https://issues.apache.org/jira/browse/DISPATCH-1115) - 
Configure Travis to run Dispatch tests agianst the latest Proton release and 
Proton master branch
\ No newline at end of file
+ - [DISPATCH-1115](https://issues.apache.org/jira/browse/DISPATCH-1115) - 
Configure Travis to run Dispatch tests agianst the latest Proton release and 
Proton main branch
diff --git a/input/releases/qpid-dispatch-1.7.0/release-notes.md 
b/input/releases/qpid-dispatch-1.7.0/release-notes.md
index a7551bf..91ec04d 100644
--- a/input/releases/qpid-dispatch-1.7.0/release-notes.md
+++ b/input/releases/qpid-dispatch-1.7.0/release-notes.md
@@ -42,4 +42,4 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-1314](https://issues.apache.org/jira/browse/DISPATCH-1314) - 
spurious error in log when using healthz or metrics
  - [DISPATCH-1315](https://issues.apache.org/jira/browse/DISPATCH-1315) - 
attempt to wake a deleted http connection
  - [DISPATCH-1316](https://issues.apache.org/jira/browse/DISPATCH-1316) - race 
in remote_sasl can cause use after free
- - [DISPATCH-1319](https://issues.apache.org/jira/browse/DISPATCH-1319) - 
Coverity issues on master branch
\ No newline at end of file
+ - [DISPATCH-1319](https://issues.apache.org/jira/browse/DISPATCH-1319) - 
Coverity issues on main branch
diff --git a/input/releases/qpid-dispatch-1.9.0/release-notes.md 
b/input/releases/qpid-dispatch-1.9.0/release-notes.md
index 6712385..e16a8e3 100644
--- a/input/releases/qpid-dispatch-1.9.0/release-notes.md
+++ b/input/releases/qpid-dispatch-1.9.0/release-notes.md
@@ -59,7 +59,7 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-1378](https://issues.apache.org/jira/browse/DISPATCH-1378) - 
missing lock of connection's links_with_work list
  - [DISPATCH-1380](https://issues.apache.org/jira/browse/DISPATCH-1380) - 
qdrouterd leaves dangling qd_link_t pointer
  - [DISPATCH-1383](https://issues.apache.org/jira/browse/DISPATCH-1383) - 
system_tests_policy is timing out
- - [DISPATCH-1387](https://issues.apache.org/jira/browse/DISPATCH-1387) - 
Coverity issues on master branch
+ - [DISPATCH-1387](https://issues.apache.org/jira/browse/DISPATCH-1387) - 
Coverity issues on main branch
  - [DISPATCH-1391](https://issues.apache.org/jira/browse/DISPATCH-1391) - 
Proton link reference not cleared on router link objects during session close
  - [DISPATCH-1394](https://issues.apache.org/jira/browse/DISPATCH-1394) - 
qd_check_message() incorrectly validates partially received messages
  - [DISPATCH-1398](https://issues.apache.org/jira/browse/DISPATCH-1398) - 
"Expression with no effect" warning for console web
@@ -69,4 +69,4 @@ documentation, see the [release overview](index.html).
  - [DISPATCH-1408](https://issues.apache.org/jira/browse/DISPATCH-1408) - 
system_tests_distribution failing when running under valgrind
  - [DISPATCH-1410](https://issues.apache.org/jira/browse/DISPATCH-1410) - 
attach of auto-links not logged
  - [DISPATCH-1413](https://issues.apache.org/jira/browse/DISPATCH-1413) - 
system_tests_two_routers.py failing intermittently on Travis
- - [DISPATCH-1417](https://issues.apache.org/jira/browse/DISPATCH-1417) - 
Crash when connection_wake ctx points to freed memory
\ No newline at end of file
+ - [DISPATCH-1417](https://issues.apache.org/jira/browse/DISPATCH-1417) - 
Crash when connection_wake ctx points to freed memory
diff --git a/input/releases/qpid-proton-0.18.0/index.md 
b/input/releases/qpid-proton-0.18.0/index.md
index eba4123..a3fef17 100644
--- a/input/releases/qpid-proton-0.18.0/index.md
+++ b/input/releases/qpid-proton-0.18.0/index.md
@@ -49,7 +49,6 @@ the files you download.
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
  - [Python API reference](proton/python/api/index.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Installing Qpid 
Proton](https://gitbox.apache.org/repos/asf?p=qpid-proton.git;a=blob;f=INSTALL.md;hb=0.18.0)
 
 </div>
diff --git a/input/releases/qpid-proton-0.18.1/index.md 
b/input/releases/qpid-proton-0.18.1/index.md
index 6a1db02..7334fd4 100644
--- a/input/releases/qpid-proton-0.18.1/index.md
+++ b/input/releases/qpid-proton-0.18.1/index.md
@@ -49,7 +49,6 @@ the files you download.
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
  - [Python API reference](proton/python/api/index.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Installing Qpid 
Proton](https://gitbox.apache.org/repos/asf?p=qpid-proton.git;a=blob;f=INSTALL.md;hb=0.18.1)
 
 </div>
diff --git a/input/releases/qpid-proton-0.19.0/index.md 
b/input/releases/qpid-proton-0.19.0/index.md
index 0cc85a7..f2bdc07 100644
--- a/input/releases/qpid-proton-0.19.0/index.md
+++ b/input/releases/qpid-proton-0.19.0/index.md
@@ -49,7 +49,6 @@ the files you download.
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
  - [Python API reference](proton/python/api/index.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Installing Qpid 
Proton](https://gitbox.apache.org/repos/asf?p=qpid-proton.git;a=blob;f=INSTALL.md;hb=0.19.0)
 
 </div>
diff --git a/input/releases/qpid-proton-0.20.0/index.md 
b/input/releases/qpid-proton-0.20.0/index.md
index 11151ee..42eb067 100644
--- a/input/releases/qpid-proton-0.20.0/index.md
+++ b/input/releases/qpid-proton-0.20.0/index.md
@@ -49,7 +49,6 @@ the files you download.
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
  - [Python API reference](proton/python/api/index.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Installing Qpid 
Proton](https://gitbox.apache.org/repos/asf?p=qpid-proton.git;a=blob;f=INSTALL.md;hb=0.20.0)
 
 </div>
diff --git a/input/releases/qpid-proton-0.21.0/index.md 
b/input/releases/qpid-proton-0.21.0/index.md
index f932eb3..5126f99 100644
--- a/input/releases/qpid-proton-0.21.0/index.md
+++ b/input/releases/qpid-proton-0.21.0/index.md
@@ -49,7 +49,6 @@ the files you download.
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
  - [Python API reference](proton/python/api/index.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Installing Qpid 
Proton](https://gitbox.apache.org/repos/asf?p=qpid-proton.git;a=blob;f=INSTALL.md;hb=0.21.0)
 
 </div>
diff --git a/input/releases/qpid-proton-0.22.0/index.md 
b/input/releases/qpid-proton-0.22.0/index.md
index 474feff..8ac4b78 100644
--- a/input/releases/qpid-proton-0.22.0/index.md
+++ b/input/releases/qpid-proton-0.22.0/index.md
@@ -49,7 +49,6 @@ the files you download.
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
  - [Python API reference](proton/python/api/index.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Installing Qpid 
Proton](https://gitbox.apache.org/repos/asf?p=qpid-proton.git;a=blob;f=INSTALL.md;hb=0.22.0)
 
 </div>
@@ -67,4 +66,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.23.0/index.md 
b/input/releases/qpid-proton-0.23.0/index.md
index bea115f..1f19211 100644
--- a/input/releases/qpid-proton-0.23.0/index.md
+++ b/input/releases/qpid-proton-0.23.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/book/overview.html)
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.24.0/index.md 
b/input/releases/qpid-proton-0.24.0/index.md
index 79767bb..55a3f42 100644
--- a/input/releases/qpid-proton-0.24.0/index.md
+++ b/input/releases/qpid-proton-0.24.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/book/overview.html)
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.25.0/index.md 
b/input/releases/qpid-proton-0.25.0/index.md
index 64d5d9f..16ef6db 100644
--- a/input/releases/qpid-proton-0.25.0/index.md
+++ b/input/releases/qpid-proton-0.25.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/book/overview.html)
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.26.0/index.md 
b/input/releases/qpid-proton-0.26.0/index.md
index 257dcfd..713c44b 100644
--- a/input/releases/qpid-proton-0.26.0/index.md
+++ b/input/releases/qpid-proton-0.26.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/book/overview.html)
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.27.0/index.md 
b/input/releases/qpid-proton-0.27.0/index.md
index a9b6d8c..790997a 100644
--- a/input/releases/qpid-proton-0.27.0/index.md
+++ b/input/releases/qpid-proton-0.27.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/book/overview.html)
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.27.1/index.md 
b/input/releases/qpid-proton-0.27.1/index.md
index e831d2d..89edf9b 100644
--- a/input/releases/qpid-proton-0.27.1/index.md
+++ b/input/releases/qpid-proton-0.27.1/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/book/overview.html)
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.28.0/index.md 
b/input/releases/qpid-proton-0.28.0/index.md
index 3a34686..1b51bf6 100644
--- a/input/releases/qpid-proton-0.28.0/index.md
+++ b/input/releases/qpid-proton-0.28.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/book/overview.html)
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.29.0/index.md 
b/input/releases/qpid-proton-0.29.0/index.md
index 40c6916..fcf239b 100644
--- a/input/releases/qpid-proton-0.29.0/index.md
+++ b/input/releases/qpid-proton-0.29.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/book/overview.html)
  - [Python tutorial](proton/python/book/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.29.0/release-notes.md 
b/input/releases/qpid-proton-0.29.0/release-notes.md
index 1494493..674c53a 100644
--- a/input/releases/qpid-proton-0.29.0/release-notes.md
+++ b/input/releases/qpid-proton-0.29.0/release-notes.md
@@ -45,11 +45,11 @@ documentation, see the [release overview](index.html).
  - [PROTON-2067](https://issues.apache.org/jira/browse/PROTON-2067) - Enable 
linktime optimization by default
  - [PROTON-2073](https://issues.apache.org/jira/browse/PROTON-2073) - Travis 
CI build test fails on Ubuntu 1604
  - [PROTON-2074](https://issues.apache.org/jira/browse/PROTON-2074) - Using a 
connection url with characters that need to be urlencoded can cause a hang
- - [PROTON-2079](https://issues.apache.org/jira/browse/PROTON-2079) - Coverity 
issues related to printf on master branch
+ - [PROTON-2079](https://issues.apache.org/jira/browse/PROTON-2079) - Coverity 
issues related to printf on main branch
  - [PROTON-2081](https://issues.apache.org/jira/browse/PROTON-2081) - Hang in 
Windows proactor during connect
  - [PROTON-2087](https://issues.apache.org/jira/browse/PROTON-2087) - [Python] 
Detection of tox caches failure instaead of trying again if not initially found
  - [PROTON-2088](https://issues.apache.org/jira/browse/PROTON-2088) - [Python] 
Changing a python file and building does not ensure the changed file ends up in 
the installable
 
 ## Tasks
 
- - [PROTON-2053](https://issues.apache.org/jira/browse/PROTON-2053) - [Python] 
[C++] The Python and C++ bindings have different defaults for SASL
\ No newline at end of file
+ - [PROTON-2053](https://issues.apache.org/jira/browse/PROTON-2053) - [Python] 
[C++] The Python and C++ bindings have different defaults for SASL
diff --git a/input/releases/qpid-proton-0.30.0/index.md 
b/input/releases/qpid-proton-0.30.0/index.md
index 0fd1d62..4efd7e0 100644
--- a/input/releases/qpid-proton-0.30.0/index.md
+++ b/input/releases/qpid-proton-0.30.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/docs/overview.html)
  - [Python tutorial](proton/python/docs/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.31.0/index.md 
b/input/releases/qpid-proton-0.31.0/index.md
index 1f317c9..6944a8d 100644
--- a/input/releases/qpid-proton-0.31.0/index.md
+++ b/input/releases/qpid-proton-0.31.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/docs/overview.html)
  - [Python tutorial](proton/python/docs/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.32.0/index.md 
b/input/releases/qpid-proton-0.32.0/index.md
index fc4b100..9588fad 100644
--- a/input/releases/qpid-proton-0.32.0/index.md
+++ b/input/releases/qpid-proton-0.32.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/docs/overview.html)
  - [Python tutorial](proton/python/docs/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/input/releases/qpid-proton-0.33.0/index.md 
b/input/releases/qpid-proton-0.33.0/index.md
index 5df4535..16af3b4 100644
--- a/input/releases/qpid-proton-0.33.0/index.md
+++ b/input/releases/qpid-proton-0.33.0/index.md
@@ -45,7 +45,6 @@ the files you download.
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/docs/overview.html)
  - [Python tutorial](proton/python/docs/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -69,4 +68,4 @@ the files you download.
           _modifyCurrentReleaseLinks();
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/python/generate.py b/python/generate.py
index 9b130f2..cbeb4b6 100644
--- a/python/generate.py
+++ b/python/generate.py
@@ -121,7 +121,9 @@ def get_git_release_branch_url(module, release, path=""):
     }
 
     if release == "trunk":
-        release = "master"
+        release = "main"
+    elif release == "master":
+        release = "main"
 
     return "{}/{}/{}".format(modules[module], release, path.lstrip("/"))
 
diff --git a/scripts/gen-broker-j-release-notes 
b/scripts/gen-broker-j-release-notes
index 3a8f494..2e728cc 100755
--- a/scripts/gen-broker-j-release-notes
+++ b/scripts/gen-broker-j-release-notes
@@ -64,8 +64,8 @@ def gen_release_notes(release, issues_release, release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    notice("Skipping generation for master")
+if release == "main":
+    notice("Skipping generation for main branch")
     exit()
 
 gen_release_notes(release, issues_release, release_dir)
diff --git a/scripts/gen-broker-j-release-page 
b/scripts/gen-broker-j-release-page
index 6ba0920..1cfc840 100755
--- a/scripts/gen-broker-j-release-page
+++ b/scripts/gen-broker-j-release-page
@@ -200,7 +200,7 @@ This content was generated at {time} on {day}, {date}.
  - [Source repository](https://gitbox.apache.org/repos/asf/qpid-broker-j.git)
 """
     
-def gen_master_release_page(release_dir):
+def gen_main_release_page(release_dir):
     output_path = join(release_dir, "index.md")
 
     now = datetime.now()
@@ -221,8 +221,8 @@ def gen_master_release_page(release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    gen_master_release_page(release_dir)
+if release == "main":
+    gen_main_release_page(release_dir)
 else:
     gen_release_page(release, issues_release, source_release, release_dir)
 
diff --git a/scripts/gen-cpp-release-docs b/scripts/gen-cpp-release-docs
index 769df53..ceb2c2a 100755
--- a/scripts/gen-cpp-release-docs
+++ b/scripts/gen-cpp-release-docs
@@ -121,8 +121,8 @@ def gen_cpp_messaging_examples(release, source_dir, 
component_dir):
     output_dir = join(component_dir, "cpp", "examples")
 
     release_url = get_git_release_branch_url("cpp", release)
-    readme_url = 
"https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/{}".format("master")
-    source_url = 
"https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/{}".format("master")
+    readme_url = 
"https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/{}".format("main")
+    source_url = 
"https://gitbox.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/{}".format("main")
 
     input_names = list_dir(input_dir, "*.cpp", "*.h")
 
diff --git a/scripts/gen-cpp-release-notes b/scripts/gen-cpp-release-notes
index 21f3ab0..26372b7 100755
--- a/scripts/gen-cpp-release-notes
+++ b/scripts/gen-cpp-release-notes
@@ -65,8 +65,8 @@ def gen_release_notes(release, issues_release, release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    notice("Skipping generation for master")
+if release == "main":
+    notice("Skipping generation for main branch")
     exit()
 
 gen_release_notes(release, issues_release, release_dir)
diff --git a/scripts/gen-cpp-release-page b/scripts/gen-cpp-release-page
index ad9c060..b735f49 100755
--- a/scripts/gen-cpp-release-page
+++ b/scripts/gen-cpp-release-page
@@ -148,7 +148,7 @@ def gen_release_page(release, issues_release, 
source_release, release_dir):
 
     write(output_path, output)
 
-master_template = """
+main_template = """
 ;;
 ;; Licensed to the Apache Software Foundation (ASF) under one
 ;; or more contributor license agreements.  See the NOTICE file
@@ -191,7 +191,7 @@ This content was generated at {time} on {day}, {date}.
  - [Source repository](https://gitbox.apache.org/repos/asf/qpid-cpp.git)
 """
 
-def gen_master_release_page(release_dir):
+def gen_main_release_page(release_dir):
     output_path = join(release_dir, "index.md")
 
     now = datetime.now()
@@ -203,7 +203,7 @@ def gen_master_release_page(release_dir):
     vars = locals()
     vars["documentation"] = documentation
     
-    output = master_template.format(**vars)
+    output = main_template.format(**vars)
     output = output.strip()
 
     write(output_path, output)
@@ -212,8 +212,8 @@ def gen_master_release_page(release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    gen_master_release_page(release_dir)
+if release == "main":
+    gen_main_release_page(release_dir)
 else:
     gen_release_page(release, issues_release, source_release, release_dir)
 
diff --git a/scripts/gen-dispatch-release-notes 
b/scripts/gen-dispatch-release-notes
index 39af455..49c2e02 100755
--- a/scripts/gen-dispatch-release-notes
+++ b/scripts/gen-dispatch-release-notes
@@ -65,8 +65,8 @@ def gen_release_notes(release, issues_release, release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    notice("Skipping generation for master branch")
+if release == "main":
+    notice("Skipping generation for main branch")
     exit()
 
 gen_release_notes(release, issues_release, release_dir)
diff --git a/scripts/gen-dispatch-release-page 
b/scripts/gen-dispatch-release-page
index e7294ff..640bfeb 100755
--- a/scripts/gen-dispatch-release-page
+++ b/scripts/gen-dispatch-release-page
@@ -131,7 +131,7 @@ def gen_release_page(release, issues_release, 
source_release, release_dir):
 
     write(output_path, output)
 
-master_template = """
+main_template = """
 ;;
 ;; Licensed to the Apache Software Foundation (ASF) under one
 ;; or more contributor license agreements.  See the NOTICE file
@@ -174,7 +174,7 @@ This content was generated at {time} on {day}, {date}.
  - [Source repository](https://gitbox.apache.org/repos/asf/qpid-dispatch.git)
 """
 
-def gen_master_release_page(release_dir):
+def gen_main_release_page(release_dir):
     output_path = join(release_dir, "index.md")
 
     now = datetime.now()
@@ -184,17 +184,17 @@ def gen_master_release_page(release_dir):
     time = now.strftime("%H:%M %Z")
 
     vars = locals()
-    vars["documentation"] = documentation.format(release="master", 
source_release="master")
+    vars["documentation"] = documentation.format(release="main", 
source_release="main")
     
-    output = master_template.format(**vars)
+    output = main_template.format(**vars)
     output = output.strip()
 
     write(output_path, output)
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    gen_master_release_page(release_dir)
+if release == "main":
+    gen_main_release_page(release_dir)
 else:
     gen_release_page(release, issues_release, source_release, release_dir)
 
diff --git a/scripts/gen-interop-test-release-notes 
b/scripts/gen-interop-test-release-notes
index 88da8ce..fdc614b 100755
--- a/scripts/gen-interop-test-release-notes
+++ b/scripts/gen-interop-test-release-notes
@@ -65,8 +65,8 @@ def gen_release_notes(release, issues_release, release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    notice("Skipping generation for master branch")
+if release == "main":
+    notice("Skipping generation for main branch")
     exit()
 
 gen_release_notes(release, issues_release, release_dir)
diff --git a/scripts/gen-interop-test-release-page 
b/scripts/gen-interop-test-release-page
index ea06e78..becaf93 100755
--- a/scripts/gen-interop-test-release-page
+++ b/scripts/gen-interop-test-release-page
@@ -134,7 +134,7 @@ def gen_release_page(release, issues_release, 
source_release, release_dir):
 
     write(output_path, output)
 
-master_template = """
+main_template = """
 ;;
 ;; Licensed to the Apache Software Foundation (ASF) under one
 ;; or more contributor license agreements.  See the NOTICE file
@@ -177,7 +177,7 @@ This content was generated at {time} on {day}, {date}.
  - [Source 
repository](https://gitbox.apache.org/repos/asf/qpid-interop-test.git)
 """
 
-def gen_master_release_page(release_dir):
+def gen_main_release_page(release_dir):
     output_path = join(release_dir, "index.md")
 
     now = datetime.now()
@@ -187,17 +187,17 @@ def gen_master_release_page(release_dir):
     time = now.strftime("%H:%M %Z")
 
     vars = locals()
-    vars["documentation"] = documentation.format(release="master", 
source_release="master")
+    vars["documentation"] = documentation.format(release="main", 
source_release="main")
 
-    output = master_template.format(**vars)
+    output = main_template.format(**vars)
     output = output.strip()
 
     write(output_path, output)
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    gen_master_release_page(release_dir)
+if release == "main":
+    gen_main_release_page(release_dir)
 else:
     gen_release_page(release, issues_release, source_release, release_dir)
 
diff --git a/scripts/gen-jms-amqp-0-x-release-notes 
b/scripts/gen-jms-amqp-0-x-release-notes
index 19a0fb8..bb4a523 100755
--- a/scripts/gen-jms-amqp-0-x-release-notes
+++ b/scripts/gen-jms-amqp-0-x-release-notes
@@ -65,8 +65,8 @@ def gen_release_notes(release, issues_release, release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    notice("Skipping generation for master")
+if release == "main":
+    notice("Skipping generation for main branch")
     exit()
 
 gen_release_notes(release, issues_release, release_dir)
diff --git a/scripts/gen-jms-amqp-0-x-release-page 
b/scripts/gen-jms-amqp-0-x-release-page
index f74b054..19bbc8e 100755
--- a/scripts/gen-jms-amqp-0-x-release-page
+++ b/scripts/gen-jms-amqp-0-x-release-page
@@ -134,7 +134,7 @@ def gen_release_page(release, issues_release, 
source_release, release_dir):
 
     write(output_path, output)
 
-master_template = """
+main_template = """
 ;;
 ;; Licensed to the Apache Software Foundation (ASF) under one
 ;; or more contributor license agreements.  See the NOTICE file
@@ -177,7 +177,7 @@ This content was generated at {time} on {day}, {date}.
  - [Source 
repository](https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git)
 """
 
-def gen_master_release_page(release_dir):
+def gen_main_release_page(release_dir):
     output_path = join(release_dir, "index.md")
 
     now = datetime.now()
@@ -187,17 +187,17 @@ def gen_master_release_page(release_dir):
     time = now.strftime("%H:%M %Z")
 
     vars = locals()
-    vars["documentation"] = documentation.format(release="master", 
source_release="master")
+    vars["documentation"] = documentation.format(release="main", 
source_release="main")
 
-    output = master_template.format(**vars)
+    output = main_template.format(**vars)
     output = output.strip()
 
     write(output_path, output)
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    gen_master_release_page(release_dir)
+if release == "main":
+    gen_main_release_page(release_dir)
 else:
     gen_release_page(release, issues_release, source_release, release_dir)
 
diff --git a/scripts/gen-jms-release-notes b/scripts/gen-jms-release-notes
index 6219269..1c7c913 100755
--- a/scripts/gen-jms-release-notes
+++ b/scripts/gen-jms-release-notes
@@ -67,8 +67,8 @@ def gen_release_notes(release, issues_release, release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    notice("Skipping generation for master")
+if release == "main":
+    notice("Skipping generation for main branch")
     exit()
 
 gen_release_notes(release, issues_release, release_dir)
diff --git a/scripts/gen-jms-release-page b/scripts/gen-jms-release-page
index aaf29ef..09a22c4 100755
--- a/scripts/gen-jms-release-page
+++ b/scripts/gen-jms-release-page
@@ -133,7 +133,7 @@ def gen_release_page(release, issues_release, 
source_release, release_dir):
 
     write(output_path, output)
 
-master_template = """
+main_template = """
 ;;
 ;; Licensed to the Apache Software Foundation (ASF) under one
 ;; or more contributor license agreements.  See the NOTICE file
@@ -176,7 +176,7 @@ This content was generated at {time} on {day}, {date}.
  - [Source repository](https://gitbox.apache.org/repos/asf/qpid-jms.git)
 """
 
-def gen_master_release_page(release_dir):
+def gen_main_release_page(release_dir):
     output_path = join(release_dir, "index.md")
 
     now = datetime.now()
@@ -186,17 +186,17 @@ def gen_master_release_page(release_dir):
     time = now.strftime("%H:%M %Z")
 
     vars = locals()
-    vars["documentation"] = documentation.format(release="master", 
source_release="master")
+    vars["documentation"] = documentation.format(release="main", 
source_release="main")
 
-    output = master_template.format(**vars)
+    output = main_template.format(**vars)
     output = output.strip()
 
     write(output_path, output)
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    gen_master_release_page(release_dir)
+if release == "main":
+    gen_main_release_page(release_dir)
 else:
     gen_release_page(release, issues_release, source_release, release_dir)
 
diff --git a/scripts/gen-proton-j-release-notes 
b/scripts/gen-proton-j-release-notes
index 196ad76..e698ab9 100755
--- a/scripts/gen-proton-j-release-notes
+++ b/scripts/gen-proton-j-release-notes
@@ -64,8 +64,8 @@ def gen_release_notes(release, issues_release, release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    notice("Skipping generation for master")
+if release == "main":
+    notice("Skipping generation for main branch")
     exit()
 
 gen_release_notes(release, issues_release, release_dir)
diff --git a/scripts/gen-proton-j-release-page 
b/scripts/gen-proton-j-release-page
index fe4c732..e5187cc 100755
--- a/scripts/gen-proton-j-release-page
+++ b/scripts/gen-proton-j-release-page
@@ -127,7 +127,7 @@ def gen_release_page(release, issues_release, 
source_release, release_dir):
 
     write(output_path, output)
 
-master_template = """
+main_template = """
 ;;
 ;; Licensed to the Apache Software Foundation (ASF) under one
 ;; or more contributor license agreements.  See the NOTICE file
@@ -170,7 +170,7 @@ This content was generated at {time} on {day}, {date}.
  - [Source 
repository](https://gitbox.apache.org/repos/asf/qpid-proton-j.git?a=tree)
 """
 
-def gen_master_release_page(release_dir):
+def gen_main_release_page(release_dir):
     output_path = join(release_dir, "index.md")
 
     now = datetime.now()
@@ -180,17 +180,17 @@ def gen_master_release_page(release_dir):
     time = now.strftime("%H:%M %Z")
 
     vars = locals()
-    vars["documentation"] = documentation.format(release="master", 
source_release="master")
+    vars["documentation"] = documentation.format(release="main", 
source_release="main")
 
-    output = master_template.format(**vars)
+    output = main_template.format(**vars)
     output = output.strip()
 
     write(output_path, output)
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    gen_master_release_page(release_dir)
+if release == "main":
+    gen_main_release_page(release_dir)
 else:
     gen_release_page(release, issues_release, source_release, release_dir)
 
diff --git a/scripts/gen-proton-release-notes b/scripts/gen-proton-release-notes
index e6a8bc5..0fa0a21 100755
--- a/scripts/gen-proton-release-notes
+++ b/scripts/gen-proton-release-notes
@@ -64,8 +64,8 @@ def gen_release_notes(release, issues_release, release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    notice("Skipping generation for master")
+if release == "main":
+    notice("Skipping generation for main branch")
     exit()
 
 gen_release_notes(release, issues_release, release_dir)
diff --git a/scripts/gen-proton-release-page b/scripts/gen-proton-release-page
index 1b7e288..6c177ee 100755
--- a/scripts/gen-proton-release-page
+++ b/scripts/gen-proton-release-page
@@ -35,7 +35,6 @@ documentation = \
  - [C++ tutorial](proton/cpp/api/tutorial_page.html)
  - [C++ examples](proton/cpp/examples/index.html)
  - [C++ API reference](proton/cpp/api/annotated.html)
-;; - [Go 
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
  - [Python overview](proton/python/docs/overview.html)
  - [Python tutorial](proton/python/docs/tutorial.html)
  - [Python examples](proton/python/examples/index.html)
@@ -135,7 +134,7 @@ def gen_release_page(release, issues_release, 
source_release, release_dir):
 
     write(output_path, output)
 
-master_template = """
+main_template = """
 ;;
 ;; Licensed to the Apache Software Foundation (ASF) under one
 ;; or more contributor license agreements.  See the NOTICE file
@@ -178,7 +177,7 @@ This content was generated at {time} on {day}, {date}.
  - [Source 
repository](https://gitbox.apache.org/repos/asf/qpid-proton.git?a=tree)
 """
 
-def gen_master_release_page(release_dir):
+def gen_main_release_page(release_dir):
     output_path = join(release_dir, "index.md")
 
     now = datetime.now()
@@ -188,17 +187,17 @@ def gen_master_release_page(release_dir):
     time = now.strftime("%H:%M %Z")
 
     vars = locals()
-    vars["documentation"] = documentation.format(release="master", 
source_release="master")
+    vars["documentation"] = documentation.format(release="main", 
source_release="main")
 
-    output = master_template.format(**vars)
+    output = main_template.format(**vars)
     output = output.strip()
 
     write(output_path, output)
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    gen_master_release_page(release_dir)
+if release == "main":
+    gen_main_release_page(release_dir)
 else:
     gen_release_page(release, issues_release, source_release, release_dir)
 
diff --git a/scripts/gen-python-release-notes b/scripts/gen-python-release-notes
index a95e479..218f43f 100755
--- a/scripts/gen-python-release-notes
+++ b/scripts/gen-python-release-notes
@@ -66,8 +66,8 @@ def gen_release_notes(release, issues_release, release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    notice("Skipping generation for master")
+if release == "main":
+    notice("Skipping generation for main branch")
     exit()
 
 gen_release_notes(release, issues_release, release_dir)
diff --git a/scripts/gen-python-release-page b/scripts/gen-python-release-page
index abad869..6082048 100755
--- a/scripts/gen-python-release-page
+++ b/scripts/gen-python-release-page
@@ -146,7 +146,7 @@ def gen_release_page(release, issues_release, 
source_release, release_dir):
 
     write(output_path, output)
 
-master_template = """
+main_template = """
 ;;
 ;; Licensed to the Apache Software Foundation (ASF) under one
 ;; or more contributor license agreements.  See the NOTICE file
@@ -189,7 +189,7 @@ This content was generated at {time} on {day}, {date}.
  - [Source repository](https://gitbox.apache.org/repos/asf/qpid-python.git)
 """
 
-def gen_master_release_page(release_dir):
+def gen_main_release_page(release_dir):
     output_path = join(release_dir, "index.md")
 
     now = datetime.now()
@@ -201,7 +201,7 @@ def gen_master_release_page(release_dir):
     vars = locals()
     vars["documentation"] = documentation
     
-    output = master_template.format(**vars)
+    output = main_template.format(**vars)
     output = output.strip()
 
     write(output_path, output)
@@ -210,8 +210,8 @@ def gen_master_release_page(release_dir):
 
 release, issues_release, source_release, release_dir, checkout_dir = 
setup_release_script()
 
-if release == "master":
-    gen_master_release_page(release_dir)
+if release == "main":
+    gen_main_release_page(release_dir)
 else:
     gen_release_page(release, issues_release, source_release, release_dir)
 
diff --git a/scripts/list-current-committers b/scripts/list-current-committers
index 5820d2f..697d741 100755
--- a/scripts/list-current-committers
+++ b/scripts/list-current-committers
@@ -32,10 +32,10 @@ svn log -r{$DATE}:HEAD -q 
http://svn.apache.org/repos/asf/qpid | egrep '^r' | cu
 (
     cd $work_dir
 
-    git clone --bare --branch master 
"http://gitbox.apache.org/repos/asf/qpid-proton.git";
-    git clone --bare --branch master 
"http://gitbox.apache.org/repos/asf/qpid-dispatch.git";
-    git clone --bare --branch master 
"http://gitbox.apache.org/repos/asf/qpid-jms.git";
-    git clone --bare --branch master 
"http://gitbox.apache.org/repos/asf/qpid-interop-test.git";
+    git clone --bare --branch main 
"http://gitbox.apache.org/repos/asf/qpid-proton.git";
+    git clone --bare --branch main 
"http://gitbox.apache.org/repos/asf/qpid-dispatch.git";
+    git clone --bare --branch main 
"http://gitbox.apache.org/repos/asf/qpid-jms.git";
+    git clone --bare --branch main 
"http://gitbox.apache.org/repos/asf/qpid-interop-test.git";
 
     (cd qpid-proton.git && git log --since "$DATE" --format="format:%ce%n" >> 
$temp_list)
     (cd qpid-dispatch.git && git log --since "$DATE" --format="format:%ce%n" 
>> $temp_list)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to