diff --git a/content/amqp/index.html b/content/amqp/index.html
index 5e99293971..8f809828a0 100644
--- a/content/amqp/index.html
+++ b/content/amqp/index.html
@@ -180,7 +180,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -188,7 +188,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/amqp/type-reference.html b/content/amqp/type-reference.html
index b852e37c01..0e33096cb1 100644
--- a/content/amqp/type-reference.html
+++ b/content/amqp/type-reference.html
@@ -12437,7 +12437,7 @@ <h3>Cross Reference Index</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -12445,7 +12445,7 @@ <h3>Cross Reference Index</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/broker-j/index.html b/content/components/broker-j/index.html
index 1d2a80cbb8..dfdf80e3eb 100644
--- a/content/components/broker-j/index.html
+++ b/content/components/broker-j/index.html
@@ -211,7 +211,7 @@ <h2 id="resources">Resources</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -219,7 +219,7 @@ <h2 id="resources">Resources</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/broker-j/security.html b/content/components/broker-j/security.html
index e96ab11771..f4f8dc8966 100644
--- a/content/components/broker-j/security.html
+++ b/content/components/broker-j/security.html
@@ -248,7 +248,7 @@ <h1 id="security">Security</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -256,7 +256,7 @@ <h1 id="security">Security</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/cpp-broker/index.html b/content/components/cpp-broker/index.html
index 44c120ced6..3867cac671 100644
--- a/content/components/cpp-broker/index.html
+++ b/content/components/cpp-broker/index.html
@@ -210,7 +210,7 @@ <h2 id="resources">Resources</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -218,7 +218,7 @@ <h2 id="resources">Resources</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/cpp-broker/security.html b/content/components/cpp-broker/security.html
index 05e8c572de..160b0bba0a 100644
--- a/content/components/cpp-broker/security.html
+++ b/content/components/cpp-broker/security.html
@@ -178,7 +178,7 @@ <h1 id="security">Security</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1 id="security">Security</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/dispatch-router/addressing.html b/content/components/dispatch-router/addressing.html
index b1b78681a4..35d509a4b7 100644
--- a/content/components/dispatch-router/addressing.html
+++ b/content/components/dispatch-router/addressing.html
@@ -258,7 +258,7 @@ <h3 id="link-routing">Link routing</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -266,7 +266,7 @@ <h3 id="link-routing">Link routing</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/dispatch-router/amqp-mapping.html b/content/components/dispatch-router/amqp-mapping.html
index af2c141801..95b8901290 100644
--- a/content/components/dispatch-router/amqp-mapping.html
+++ b/content/components/dispatch-router/amqp-mapping.html
@@ -390,7 +390,7 @@ <h3 id="manageable-entities">Manageable Entities</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -398,7 +398,7 @@ <h3 id="manageable-entities">Manageable Entities</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/dispatch-router/index.html b/content/components/dispatch-router/index.html
index a92ea4804f..fbb887a72f 100644
--- a/content/components/dispatch-router/index.html
+++ b/content/components/dispatch-router/index.html
@@ -213,7 +213,7 @@ <h2 id="resources">Resources</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -221,7 +221,7 @@ <h2 id="resources">Resources</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/dispatch-router/overview.html b/content/components/dispatch-router/overview.html
index 764c7f70d9..715cdf6eb8 100644
--- a/content/components/dispatch-router/overview.html
+++ b/content/components/dispatch-router/overview.html
@@ -167,7 +167,7 @@ <h3 id="simplifies-reliability">Simplifies reliability</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h3 id="simplifies-reliability">Simplifies reliability</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/dispatch-router/release-0.1.html b/content/components/dispatch-router/release-0.1.html
index ec30d9c212..ad54d03455 100644
--- a/content/components/dispatch-router/release-0.1.html
+++ b/content/components/dispatch-router/release-0.1.html
@@ -471,7 +471,7 @@ <h2 id="issues-addressed-in-this-release">Issues Addressed in this Release</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -479,7 +479,7 @@ <h2 id="issues-addressed-in-this-release">Issues Addressed in this Release</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/dispatch-router/security.html b/content/components/dispatch-router/security.html
index 245b2998cc..7fb835e8e3 100644
--- a/content/components/dispatch-router/security.html
+++ b/content/components/dispatch-router/security.html
@@ -157,7 +157,7 @@ <h1 id="security">Security</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h1 id="security">Security</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/index.html b/content/components/index.html
index 99da42f793..376c125bd1 100644
--- a/content/components/index.html
+++ b/content/components/index.html
@@ -222,7 +222,7 @@ <h2 id="compatibility">Compatibility</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -230,7 +230,7 @@ <h2 id="compatibility">Compatibility</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/interop-test/index.html b/content/components/interop-test/index.html
index 5a667f7284..8e2133f84f 100644
--- a/content/components/interop-test/index.html
+++ b/content/components/interop-test/index.html
@@ -293,7 +293,7 @@ <h2 id="source-code">Source code</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -301,7 +301,7 @@ <h2 id="source-code">Source code</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/java-broker/index.html b/content/components/java-broker/index.html
index 35cb022395..7c489a3c8f 100644
--- a/content/components/java-broker/index.html
+++ b/content/components/java-broker/index.html
@@ -130,7 +130,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/java-broker/security.html b/content/components/java-broker/security.html
index 9ca9d02b9b..497ae034f5 100644
--- a/content/components/java-broker/security.html
+++ b/content/components/java-broker/security.html
@@ -130,7 +130,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/jms/amqp-0-x.html b/content/components/jms/amqp-0-x.html
index a26d0895ef..2bba56b724 100644
--- a/content/components/jms/amqp-0-x.html
+++ b/content/components/jms/amqp-0-x.html
@@ -194,7 +194,7 @@ <h2 id="resources">Resources</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -202,7 +202,7 @@ <h2 id="resources">Resources</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/jms/index.html b/content/components/jms/index.html
index 972708e347..3f51b0aa3c 100644
--- a/content/components/jms/index.html
+++ b/content/components/jms/index.html
@@ -200,7 +200,7 @@ <h2 id="resources">Resources</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -208,7 +208,7 @@ <h2 id="resources">Resources</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/jms/security-0-x.html b/content/components/jms/security-0-x.html
index aaccb9279b..d94f8b4e87 100644
--- a/content/components/jms/security-0-x.html
+++ b/content/components/jms/security-0-x.html
@@ -162,7 +162,7 @@ <h2 id="amqp-0-x-jms-amqp-0-8-0-9-0-9-1-0-10">AMQP 0-x JMS (AMQP 0-8, 0-9, 0-9-1
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -170,7 +170,7 @@ <h2 id="amqp-0-x-jms-amqp-0-8-0-9-0-9-1-0-10">AMQP 0-x JMS (AMQP 0-8, 0-9, 0-9-1
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/jms/security.html b/content/components/jms/security.html
index b87076cb86..80d0973fca 100644
--- a/content/components/jms/security.html
+++ b/content/components/jms/security.html
@@ -155,7 +155,7 @@ <h2 id="amqp-10-jms">AMQP 1.0 JMS</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -163,7 +163,7 @@ <h2 id="amqp-10-jms">AMQP 1.0 JMS</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/components/messaging-api/index.html b/content/components/messaging-api/index.html
index 3f6dc64ece..d11da28bc4 100644
--- a/content/components/messaging-api/index.html
+++ b/content/components/messaging-api/index.html
@@ -199,7 +199,7 @@ <h3 id="examples">Examples</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -207,7 +207,7 @@ <h3 id="examples">Examples</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/contributors.html b/content/contributors.html
index 955b650f17..b78f5b1d67 100644
--- a/content/contributors.html
+++ b/content/contributors.html
@@ -250,7 +250,7 @@ <h2 id="apache-sponsors">Apache sponsors</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -258,7 +258,7 @@ <h2 id="apache-sponsors">Apache sponsors</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2014-3629.html b/content/cves/CVE-2014-3629.html
index 70bf0048df..1ed22fce76 100644
--- a/content/cves/CVE-2014-3629.html
+++ b/content/cves/CVE-2014-3629.html
@@ -178,7 +178,7 @@ <h2 id="credit">Credit</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h2 id="credit">Credit</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2015-0203.html b/content/cves/CVE-2015-0203.html
index 1a6476f934..b518ec539b 100644
--- a/content/cves/CVE-2015-0203.html
+++ b/content/cves/CVE-2015-0203.html
@@ -189,7 +189,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2015-0223.html b/content/cves/CVE-2015-0223.html
index 8b9e238200..dd1b4aa668 100644
--- a/content/cves/CVE-2015-0223.html
+++ b/content/cves/CVE-2015-0223.html
@@ -168,7 +168,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2015-0224.html b/content/cves/CVE-2015-0224.html
index 9e1e2a68ae..7efe2330b8 100644
--- a/content/cves/CVE-2015-0224.html
+++ b/content/cves/CVE-2015-0224.html
@@ -177,7 +177,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -185,7 +185,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2016-2166.html b/content/cves/CVE-2016-2166.html
index b66674a8b6..b14ccc0caf 100644
--- a/content/cves/CVE-2016-2166.html
+++ b/content/cves/CVE-2016-2166.html
@@ -192,7 +192,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -200,7 +200,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2016-3094.html b/content/cves/CVE-2016-3094.html
index 9308fef89d..0ae91ca97d 100644
--- a/content/cves/CVE-2016-3094.html
+++ b/content/cves/CVE-2016-3094.html
@@ -180,7 +180,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -188,7 +188,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2016-4432.html b/content/cves/CVE-2016-4432.html
index ed448b5f51..ae9f43f474 100644
--- a/content/cves/CVE-2016-4432.html
+++ b/content/cves/CVE-2016-4432.html
@@ -177,7 +177,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -185,7 +185,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2016-4467.html b/content/cves/CVE-2016-4467.html
index 8845efd529..48c727f142 100644
--- a/content/cves/CVE-2016-4467.html
+++ b/content/cves/CVE-2016-4467.html
@@ -188,7 +188,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -196,7 +196,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2016-4974.html b/content/cves/CVE-2016-4974.html
index 996465316c..34a2c73429 100644
--- a/content/cves/CVE-2016-4974.html
+++ b/content/cves/CVE-2016-4974.html
@@ -177,7 +177,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -185,7 +185,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2016-4974_0-x.html b/content/cves/CVE-2016-4974_0-x.html
index 4f6a0bae2b..d85424e728 100644
--- a/content/cves/CVE-2016-4974_0-x.html
+++ b/content/cves/CVE-2016-4974_0-x.html
@@ -177,7 +177,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -185,7 +185,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2016-8741.html b/content/cves/CVE-2016-8741.html
index 1271f572fe..8796d42073 100644
--- a/content/cves/CVE-2016-8741.html
+++ b/content/cves/CVE-2016-8741.html
@@ -172,7 +172,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2017-15699.html b/content/cves/CVE-2017-15699.html
index 6ecdf99e37..317b9096f6 100644
--- a/content/cves/CVE-2017-15699.html
+++ b/content/cves/CVE-2017-15699.html
@@ -160,7 +160,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2017-15701.html b/content/cves/CVE-2017-15701.html
index d60828b1f7..95dcf569a9 100644
--- a/content/cves/CVE-2017-15701.html
+++ b/content/cves/CVE-2017-15701.html
@@ -167,7 +167,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2017-15702.html b/content/cves/CVE-2017-15702.html
index dc1751441e..a3350f983d 100644
--- a/content/cves/CVE-2017-15702.html
+++ b/content/cves/CVE-2017-15702.html
@@ -174,7 +174,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2018-1298.html b/content/cves/CVE-2018-1298.html
index 51276fe2a7..a775ba8ec2 100644
--- a/content/cves/CVE-2018-1298.html
+++ b/content/cves/CVE-2018-1298.html
@@ -211,7 +211,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -219,7 +219,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2018-17187.html b/content/cves/CVE-2018-17187.html
index 87e61bfabf..1e8db4d00a 100644
--- a/content/cves/CVE-2018-17187.html
+++ b/content/cves/CVE-2018-17187.html
@@ -182,7 +182,7 @@ <h2 id="credit">Credit</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h2 id="credit">Credit</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2018-8030.html b/content/cves/CVE-2018-8030.html
index c1852d5b41..0d4f6f8400 100644
--- a/content/cves/CVE-2018-8030.html
+++ b/content/cves/CVE-2018-8030.html
@@ -181,7 +181,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -189,7 +189,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2019-0200.html b/content/cves/CVE-2019-0200.html
index 28759c3c57..b3fb5be7e5 100644
--- a/content/cves/CVE-2019-0200.html
+++ b/content/cves/CVE-2019-0200.html
@@ -175,7 +175,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2019-0223.html b/content/cves/CVE-2019-0223.html
index 1fb636309b..1d59735bbc 100644
--- a/content/cves/CVE-2019-0223.html
+++ b/content/cves/CVE-2019-0223.html
@@ -173,7 +173,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-66257.html b/content/cves/CVE-2026-66257.html
index 5db407d5b6..925eafc0b7 100644
--- a/content/cves/CVE-2026-66257.html
+++ b/content/cves/CVE-2026-66257.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-66273.html b/content/cves/CVE-2026-66273.html
index a991139daa..622b08d848 100644
--- a/content/cves/CVE-2026-66273.html
+++ b/content/cves/CVE-2026-66273.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-66274.html b/content/cves/CVE-2026-66274.html
index d84e6cde3c..7428aeea6f 100644
--- a/content/cves/CVE-2026-66274.html
+++ b/content/cves/CVE-2026-66274.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-66275.html b/content/cves/CVE-2026-66275.html
index 65415ec152..3e47119c6f 100644
--- a/content/cves/CVE-2026-66275.html
+++ b/content/cves/CVE-2026-66275.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-66276.html b/content/cves/CVE-2026-66276.html
index d649d44141..1587ede29d 100644
--- a/content/cves/CVE-2026-66276.html
+++ b/content/cves/CVE-2026-66276.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-66277.html b/content/cves/CVE-2026-66277.html
index f9595d6954..193c2ecc81 100644
--- a/content/cves/CVE-2026-66277.html
+++ b/content/cves/CVE-2026-66277.html
@@ -142,7 +142,7 @@ <h2 id="description">Description:</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description:</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67465.html b/content/cves/CVE-2026-67465.html
index d0f31801f8..c6a40e07e3 100644
--- a/content/cves/CVE-2026-67465.html
+++ b/content/cves/CVE-2026-67465.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67551.html b/content/cves/CVE-2026-67551.html
index 9d9c14c133..3539e73484 100644
--- a/content/cves/CVE-2026-67551.html
+++ b/content/cves/CVE-2026-67551.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67552.html b/content/cves/CVE-2026-67552.html
index 6dc0eec23e..e0bf174c1b 100644
--- a/content/cves/CVE-2026-67552.html
+++ b/content/cves/CVE-2026-67552.html
@@ -142,7 +142,7 @@ <h2 id="description">Description:</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description:</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67553.html b/content/cves/CVE-2026-67553.html
index 1db2fcd617..a9f1020e07 100644
--- a/content/cves/CVE-2026-67553.html
+++ b/content/cves/CVE-2026-67553.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67554.html b/content/cves/CVE-2026-67554.html
index cb03af677d..0ed3ceac49 100644
--- a/content/cves/CVE-2026-67554.html
+++ b/content/cves/CVE-2026-67554.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67555.html b/content/cves/CVE-2026-67555.html
index 6a2d94beea..f506c78188 100644
--- a/content/cves/CVE-2026-67555.html
+++ b/content/cves/CVE-2026-67555.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67588.html b/content/cves/CVE-2026-67588.html
index 15b212a800..1c8574f371 100644
--- a/content/cves/CVE-2026-67588.html
+++ b/content/cves/CVE-2026-67588.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67589.html b/content/cves/CVE-2026-67589.html
index 4669b588d4..297724cbee 100644
--- a/content/cves/CVE-2026-67589.html
+++ b/content/cves/CVE-2026-67589.html
@@ -147,7 +147,7 @@ <h2 id="credit">Credit</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="credit">Credit</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67590.html b/content/cves/CVE-2026-67590.html
index ab9386c4db..586d265f7e 100644
--- a/content/cves/CVE-2026-67590.html
+++ b/content/cves/CVE-2026-67590.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67591.html b/content/cves/CVE-2026-67591.html
index 6b4ae1e32f..b0d1ce5005 100644
--- a/content/cves/CVE-2026-67591.html
+++ b/content/cves/CVE-2026-67591.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-67592.html b/content/cves/CVE-2026-67592.html
index cba2ad1d40..7954f66b28 100644
--- a/content/cves/CVE-2026-67592.html
+++ b/content/cves/CVE-2026-67592.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-68060.html b/content/cves/CVE-2026-68060.html
index 15cac678bc..a6ae6995b0 100644
--- a/content/cves/CVE-2026-68060.html
+++ b/content/cves/CVE-2026-68060.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-68073.html b/content/cves/CVE-2026-68073.html
index 599cae19ea..a60dd587f3 100644
--- a/content/cves/CVE-2026-68073.html
+++ b/content/cves/CVE-2026-68073.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-68074.html b/content/cves/CVE-2026-68074.html
index ccebd5c013..9cee9acb6f 100644
--- a/content/cves/CVE-2026-68074.html
+++ b/content/cves/CVE-2026-68074.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-68075.html b/content/cves/CVE-2026-68075.html
index c555e458b6..84fad8d941 100644
--- a/content/cves/CVE-2026-68075.html
+++ b/content/cves/CVE-2026-68075.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-68077.html b/content/cves/CVE-2026-68077.html
index 8827cc1de4..cf5eb54197 100644
--- a/content/cves/CVE-2026-68077.html
+++ b/content/cves/CVE-2026-68077.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-68078.html b/content/cves/CVE-2026-68078.html
index 64232e57a2..4d77bd049d 100644
--- a/content/cves/CVE-2026-68078.html
+++ b/content/cves/CVE-2026-68078.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/CVE-2026-68080.html b/content/cves/CVE-2026-68080.html
index 291aef6a0b..1c12aafb1b 100644
--- a/content/cves/CVE-2026-68080.html
+++ b/content/cves/CVE-2026-68080.html
@@ -142,7 +142,7 @@ <h2 id="description">Description</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="description">Description</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/cves/template.html b/content/cves/template.html
index 2bc9a0fcc8..0d1a8c6cb8 100644
--- a/content/cves/template.html
+++ b/content/cves/template.html
@@ -148,7 +148,7 @@ <h2 id="references">References</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h2 id="references">References</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/dashboard.html b/content/dashboard.html
index 873aa73f84..79aed6e7e0 100644
--- a/content/dashboard.html
+++ b/content/dashboard.html
@@ -279,7 +279,7 @@ <h3 id="more">More</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -287,7 +287,7 @@ <h3 id="more">More</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/deferred.js b/content/deferred.js
index d1788f0d00..11486fc52a 100644
--- a/content/deferred.js
+++ b/content/deferred.js
@@ -233,20 +233,6 @@ function _updatePathNavigation() {
     }
 }
 
-var _apacheFeather = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAOCAYAAABQFS4BAAAFnElEQVRIx83S22ukdx3H8e/v8Pyew5xnsrMJSZNsmm4PW91uL5ZWhIK9EA/Fq8Uiite9EuzVFhbxoqvd7kWLVEWEuioqpQgVtmpFssZtabpR9xCb7uQwmexMspPM5JmZ5/w8v9/v64UtiCi2StX3X/CCz4fMz8w8vN5qLSGihnf7ypkzdw333Eeaq43f/G7xtRb8H0bOnz//+He/9cLjCHpZEfL9ZrN5+9wLL55GUJ/f2W7B3M+WnzZRfqmAukA0jgpVfu1NHF1dGHZ+abbnswVckP8T+Orq6tEwjJ5/9plvlv5wZflO1PriY6dOYcwKX6xWyli/uLUaRf2jdwRUTBGl+kL6PA5HlVGQ2zNVK7T0WlJhr1wW6hcvLizE/zU4IsLS0lKxVjv09dXVP3/5RxcuHNy4dn18/r77LCIKOBFN+XWds4uQcuEOCKOZOr6b8O6E0OV+AGUtVd+I99JS4ks3XWncgctqlv36qe+9dvVDh79Xo9E4ufzH61/b6e5/YnHxEvY7bYPGNs5Wj+s8q4GdY7TkR8gxFGNdATiZKifwyHTXBZnPqZR4EScq9aNQxfPkem8YvVPhxhu/Pch+9YM/LQw+NPgTp0/PVuzydxTwh6M4sk9gLrj51nZxhwWqPdwgeXFYVcQkpdqgRlbmDhI1z3sqsyjPp4GquSMSCIrTUUATJlJSSKMeCePJ7TTr5OTQrBsH7JAY9kDK3n504WK7/ebi2tr+fww/e/bcZ6rj489YljNj2zYUnv6x50VpXRoFFGmFL9QTKR2qtocbdDAI+HhlBkp0QumUkgckI/0q6OPuEHrlHFaTEeaTGHUA3MwzXXB9Gtg69axcaoYBt+NwEN7N/L0idvsr2TtpPrnCHilcOn32lfUPDG82mx/dat366sR4XW9ttUz9k1c/LV5fLylb4DGX0x/OjeuwMh0DoKF9yg/EjhrpHu4MtlgYKFIvTslJo0oTXcGTI5f2ihVdFEBEGGhOJB3latqWrprrBwa3Ez0kDl5lR8jd5oZv0CAd21RsO99ruyet55e8Wy+/9NKK/77g7/78HinlpmmaH9Fan+ldfvVT8Po1VlpL2VVq60IM6TDTzIkOGe44xBEXYOuEbViCeSyRcerhXtBlu26blewxnTcPY44yQLRBgca52KYz6BMTDL1sztM7jU00MiWjxOEP8S5WICK7EtrJgcvg0ULXOZrnmxitdQ+it/3B8LlvfPv37j+E/33r6xvnR8POF8JOozh6e004FzehdluzQbFM0VRxzAUSRJIhwX6GlOdySgJhocH5fhqgb9kqIgAcQgiYAXE2Yv1gQJRCYMjJlEI5yh/GIzo05oNMdUSRTSovPTaMhHvqcBpMUmIWUMkMItRhZ9f1fvrEkz8/9y/hf12heZxz/KTS+nO3b63cG/VvOvLyBoOmr8enLOoveiT3MQfxUkC6JigClDAF1NAKUuFgGSg2c4bUjINODbZPJF3nd9H7RUdFQUgaloVjmYcDs05M1YWBClFUGZs8kqpqxQGDE0oBkHOiewM/VFl87X3B/7Zms/mYUvjZKPIe8lu7VSn2S8mVthGzgCIJCH2jD3yoSBpr4tQYhAQwvydJDYnuGEwxhcxWSPYYp9IXMCdivWMbmACiiRrUkLKyleq+JVBMC6ofFbpUNQEVAEpJGzsuuAMVfWD4e7XbbdtPknsp4oME8R4AOg2g61HgV73RIGdorr1GK+/vbrPEyuxiMyJwgsvkUo+jDgxdtzANU8PeylT+42PS24iQFBixcijkyInh/kqaBcpwWiM4eNAE7gjl5OuqUDsWT0zO7P7b8H/WjRs3Koh4qFwuZ1mWPYAIJwCwCAA5JKREEPJKqRnKmUcQbSCEESAeAqSISAmBKiKuEIAuALUQ9BglBBExopSuUkpfnp2dvfkX6a5m0ZqSUXAAAAAASUVORK5CYII="
-
-function _updateApacheNavigation() {
-    var elem = document.getElementById("-apache-feather");
-
-    if (!elem) {
-        return;
-    }
-
-    _log("Updating Apache navigation");
-
-    elem.src = _apacheFeather;
-}
-
 function _getHeadings() {
     var tags = ["h2", "h3", "h4", "h5", "h6"];
     var headings = [];
@@ -455,7 +441,6 @@ if (path === "/index.html" || path === "/") {
     elem.style.display = "none";
 } else {
     _updatePathNavigation();
-    _updateApacheNavigation();
     _updateHeadingSelection();
     _addHeadingAnchors();
     _focusJiraSearchForm();
diff --git a/content/discussion.html b/content/discussion.html
index de5be0c0c8..ee7d80970a 100644
--- a/content/discussion.html
+++ b/content/discussion.html
@@ -180,7 +180,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -188,7 +188,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/documentation.html b/content/documentation.html
index 347c17b4d9..6f36cd078b 100644
--- a/content/documentation.html
+++ b/content/documentation.html
@@ -226,7 +226,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/download.html b/content/download.html
index c276e10972..20a5cc6f59 100644
--- a/content/download.html
+++ b/content/download.html
@@ -262,7 +262,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -270,7 +270,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/electron/index.html b/content/electron/index.html
index 8e69d7080f..93d44358aa 100644
--- a/content/electron/index.html
+++ b/content/electron/index.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/get-involved.html b/content/get-involved.html
index 8efa76d3b6..71026b8a17 100644
--- a/content/get-involved.html
+++ b/content/get-involved.html
@@ -181,7 +181,7 @@ <h2 id="contribute">Contribute</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -189,7 +189,7 @@ <h2 id="contribute">Contribute</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/images/asf-logo.svg b/content/images/asf-logo.svg
new file mode 100644
index 0000000000..f1084dfb36
--- /dev/null
+++ b/content/images/asf-logo.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 525">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #7c297d;
+      }
+
+      .cls-2 {
+        fill: #f79a23;
+      }
+
+      .cls-3 {
+        fill: #dd552c;
+      }
+
+      .cls-4 {
+        fill: #d22128;
+      }
+    </style>
+  </defs>
+  <g>
+    <g>
+      <path class="cls-1" d="M458.8041825,181.7454822h49.0451573l87.4128103,220.0939304h-53.4548455l-14.7775045-38.0445002h-87.4060779l-15.0939249,38.0445002h-53.1384251l87.4128103-220.0939304ZM514.4537735,324.4914631l-31.1236462-80.4919562-30.8139581,80.4919562h61.9376043Z"/>
+      <path class="cls-1" d="M622.7166664,331.7220052h48.7354693c.3164204,21.0655178,16.0364536,33.3318564,40.2459781,33.3318564,20.7490974,0,33.9579648-8.4894912,33.9579648-23.2669957,0-15.4103452-14.1513961-24.5259448-45.2750423-31.4467989-51.5697879-10.6909691-76.0957328-32.0661749-76.0957328-68.2256176,0-39.9295577,31.7564869-64.7719229,82.3837461-64.7719229,52.189164,0,85.5210204,28.2960599,85.5210204,72.6285734h-48.1093609c0-19.8065687-13.8349757-31.7564869-36.7855511-31.7564869-21.0655178,0-33.9579648,8.8059116-33.9579648,23.2669957,0,13.5252877,11.6334979,22.0147789,45.2750423,29.8714294,54.7137946,12.892447,77.6643699,33.6415444,77.6643699,68.542038,0,41.5049272-32.0729073,66.3472924-84.2620713,66.3472924-55.339903,0-89.2978678-28.9289006-89.2978678-74.5203633Z"/>
+      <path class="cls-1" d="M852.9091193,181.7454822h137.7169167v45.2750423h-87.7224983v55.0234826h79.8591155v44.0228255h-79.8591155v75.7725801h-49.9944184v-220.0939304Z"/>
+    </g>
+    <g>
+      <path class="cls-3" d="M141.1077177,209.8881008c13.1869872-32.608129,27.9005344-65.1523006,43.6878912-93.9970469-23.5665852-17.5041056-46.1956909-55.2490163-55.4930639-71.9721694-3.3392448,3.7936783-5.5070609,8.1629723-6.4899838,11.7176522-8.7587851,31.6252061,22.4204029,69.8144518-2.6929393,55.86166-20.9241385-11.6267655-68.040478-37.0885068-86.0124818-11.7816095,20.1280383,25.862316,72.7733189,90.9304622,107.0005776,110.1715137Z"/>
+      <path class="cls-2" d="M184.7956089,115.8910539c15.2975784-27.9493439,31.5999598-52.4281623,48.5015202-70.0635487,0,0-16.8578001,24.4013964-40.9360438,73.180626,14.5822664,4.0158458,56.1124399,12.2562401,113.9601427-2.686207,1.4222086-10.5125619-5.645074-22.0753701-40.8636711-25.9464703-22.9926525-2.5246306,27.5975787-54.9023003-9.0516423-79.6739759-1.1832102-.8011494-2.3462234-1.508046-3.4856733-2.1408868-1.2286536-.4409688-2.5263137-.8449097-3.9114944-1.2050903-42.8025874-11.1689658-48.7354693,61.409115-65.8154369,45.8068978-27.6009449-25.2126444-45.0225792-19.3218396-53.890765-9.2435142,9.297373,16.7231532,31.9264787,54.4680639,55.4930639,71.9721694Z"/>
+      <path class="cls-4" d="M106.6818547,303.8380213c9.6626029-28.9457315,21.2860022-61.4663399,34.425863-93.9499204-34.2272587-19.2410514-86.8725393-84.3091977-107.0005776-110.1715137-3.5933909,5.0559936-6.0490149,12.1081284-6.8669953,21.7522173-4.3894911,51.802054,49.0518897,90.152876,38.3979485,97.1578844-14.0924881,9.2670774-42.1411341-22.2605096-53.19565-2.2284073,16.0229889,20.5841549,48.6614135,57.7770131,94.2394114,87.4397396Z"/>
+      <path class="cls-3" d="M254.7564893,192.1180675c-27.0589909-9.6508213,28.2758628-35.5333343,46.2445004-62.9912168,2.2990969-3.5109196,4.6756159-8.0485224,5.3202382-12.8049265-57.8477027,14.942447-99.3778763,6.7020527-113.9601427,2.686207-12.4649429,25.2564046-26.8587035,57.0835812-41.8701571,95.4579665,15.6341958,6.6852219,79.4703224,31.3794754,169.6366631,31.50739,15.1595653-39.4852227-39.6905594-44.6994265-65.3711019-53.8554202Z"/>
+      <path class="cls-4" d="M117.1371916,309.0488589c15.9001236,4.9550083,68.5841152,19.7560761,124.5366618,17.5276688,7.5166669-20.3518889-20.585838-22.3379316-22.8748364-38.6605101-1.7722907-12.6298854,73.9565291,10.6135471,98.3225807-35.3111668,1.2320197-2.3226602,2.1930625-4.5140395,3.0059935-6.6313631-90.1663407-.1279146-154.0024672-24.8221682-169.6366631-31.50739-10.9703615,28.0435968-22.2554604,59.5173251-33.3537365,94.5827612Z"/>
+      <path class="cls-1" d="M117.1371916,309.0488589c-7.1447046,22.5701977-14.1934733,46.6821031-21.0352222,72.1640414-2.4270116,9.0348114-4.8254106,18.2379315-7.190148,27.6430221,53.1064464,17.531035,102.0085414.0403941,103.6663821-21.6377674.0134647-.1716749-.018514-.2995895-.0084154-.464532,1.2639984-22.9606739-33.150083-10.2331694-32.3354689-24.0378496.8179803-13.9056654,60.0811593-.0807882,78.4082944-29.8949926,1.4053777-2.2856322,2.3209771-4.3154353,3.0312398-6.244253-55.9525467,2.2284073-108.6365383-12.5726604-124.5366618-17.5276688Z"/>
+      <path class="cls-1" d="M12.4424433,216.3982816c-.7742201,1.4036946-1.4727012,3.0261906-2.068514,4.9651069-10.2920775,33.4496725,62.4846076,78.3847312,52.5830064,88.180298-8.9254108,8.8261086-20.5572255-11.3440069-34.9004936-3.0127259-1.5720033.9155994-3.1675699,2.0701971-4.8052136,3.749918-16.2215932,16.6188018-.2541461,64.4958967,45.7698699,90.0518908-10.7397786,36.0618236-21.4324308,76.351562-31.8995493,118.4859638,3.7970444-1.3296388,8.3413795-2.6626438,9.4724141-6.244253,1.6982349-6.9814452,12.1939658-49.4625629,29.2352225-107.0948305,0,0,3.1103449-11.8051727,8.8042285-31.254927,5.2646964-17.9854685,12.7460184-42.5147795,22.0484407-70.3867014-45.577998-29.6627266-78.2164225-66.8555847-94.2394114-87.4397396Z"/>
+    </g>
+  </g>
+  <g>
+    <polygon class="cls-1" points="404.1671788 144.7351535 413.43089 144.7351535 413.43089 82.5349876 436.7786739 82.5349876 436.7786739 73.4732468 380.8193949 73.4732468 380.8193949 82.5349876 404.1671788 82.5349876 404.1671788 144.7351535"/>
+    <polygon class="cls-1" points="464.8525663 112.9584696 501.321697 112.9584696 501.321697 144.7351535 510.6796611 144.7351535 510.6796611 73.4732468 501.321697 73.4732468 501.321697 103.8899964 464.8525663 103.8899964 464.8525663 73.4732468 455.5955874 73.4732468 455.5955874 144.7351535 464.8525663 144.7351535 464.8525663 112.9584696"/>
+    <polygon class="cls-1" points="581.40298 135.9629037 546.2331925 135.9629037 546.2331925 112.8574844 577.8213707 112.8574844 577.8213707 104.0852345 546.2331925 104.0852345 546.2331925 82.1512438 580.3392689 82.1512438 580.3392689 73.4732468 536.9762136 73.4732468 536.9762136 144.7351535 581.40298 144.7351535 581.40298 135.9629037"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/content/index.html b/content/index.html
index d9861026f5..dc0fe026f4 100644
--- a/content/index.html
+++ b/content/index.html
@@ -207,7 +207,7 @@ <h2>Resources</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -215,7 +215,7 @@ <h2>Resources</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/issues.html b/content/issues.html
index 1c0d4d952b..58dbeba070 100644
--- a/content/issues.html
+++ b/content/issues.html
@@ -234,7 +234,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -242,7 +242,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/maven.html b/content/maven.html
index 0a41ab267b..af4c9d2c72 100644
--- a/content/maven.html
+++ b/content/maven.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/overview.html b/content/overview.html
index f2bb63921f..0ac0ca92e1 100644
--- a/content/overview.html
+++ b/content/overview.html
@@ -221,7 +221,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -229,7 +229,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/packages.html b/content/packages.html
index 923b5ef305..1164580446 100644
--- a/content/packages.html
+++ b/content/packages.html
@@ -137,7 +137,7 @@ <h2 id="fedora">Fedora</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h2 id="fedora">Fedora</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/proton/contributing.html b/content/proton/contributing.html
index 71d74a4ac7..5a43039528 100644
--- a/content/proton/contributing.html
+++ b/content/proton/contributing.html
@@ -130,7 +130,7 @@ <h1 id="contributing-to-proton">Contributing to Proton</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -138,7 +138,7 @@ <h1 id="contributing-to-proton">Contributing to Proton</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/proton/index.html b/content/proton/index.html
index 5189bb6188..8bc86c47f5 100644
--- a/content/proton/index.html
+++ b/content/proton/index.html
@@ -235,7 +235,7 @@ <h2 id="resources">Resources</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -243,7 +243,7 @@ <h2 id="resources">Resources</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/proton/messenger.html b/content/proton/messenger.html
index 5fc1a1ff90..f0a307af82 100644
--- a/content/proton/messenger.html
+++ b/content/proton/messenger.html
@@ -130,7 +130,7 @@ <h1 id="messenger">Messenger</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -138,7 +138,7 @@ <h1 id="messenger">Messenger</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/proton/overview.html b/content/proton/overview.html
index d8eb947375..538d16c042 100644
--- a/content/proton/overview.html
+++ b/content/proton/overview.html
@@ -155,7 +155,7 @@ <h1 id="overview">Overview</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -163,7 +163,7 @@ <h1 id="overview">Overview</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/proton/security-dotnet.html b/content/proton/security-dotnet.html
index 4de2f033b8..70ec03c693 100644
--- a/content/proton/security-dotnet.html
+++ b/content/proton/security-dotnet.html
@@ -185,7 +185,7 @@ <h1 id="security-proton-dotnet">Security - Proton-Dotnet</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -193,7 +193,7 @@ <h1 id="security-proton-dotnet">Security - Proton-Dotnet</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/proton/security-j.html b/content/proton/security-j.html
index 699023c98e..dbd3798b82 100644
--- a/content/proton/security-j.html
+++ b/content/proton/security-j.html
@@ -194,7 +194,7 @@ <h2 id="proton-j">Proton-J</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -202,7 +202,7 @@ <h2 id="proton-j">Proton-J</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/proton/security-j2.html b/content/proton/security-j2.html
index 34686b2151..849878c1e3 100644
--- a/content/proton/security-j2.html
+++ b/content/proton/security-j2.html
@@ -178,7 +178,7 @@ <h1 id="security-protonj2">Security - ProtonJ2</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1 id="security-protonj2">Security - ProtonJ2</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/proton/security.html b/content/proton/security.html
index 71bb19c997..54fa61325c 100644
--- a/content/proton/security.html
+++ b/content/proton/security.html
@@ -164,7 +164,7 @@ <h1 id="security">Security</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -172,7 +172,7 @@ <h1 id="security">Security</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/proton/submitting-patches.html b/content/proton/submitting-patches.html
index 16a95f9e01..5d62a006b4 100644
--- a/content/proton/submitting-patches.html
+++ b/content/proton/submitting-patches.html
@@ -159,7 +159,7 @@ <h2 id="keep-it-clean">Keep it clean</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h2 id="keep-it-clean">Keep it clean</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/index.html b/content/releases/index.html
index 07da9cace7..faebcb6d9e 100644
--- a/content/releases/index.html
+++ b/content/releases/index.html
@@ -247,7 +247,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -255,7 +255,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Apache-Qpid-Broker-J-Book.html b/content/releases/qpid-broker-j-10.0.0/book/Apache-Qpid-Broker-J-Book.html
index 17ede1f5da..28d8e79b15 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Apache-Qpid-Broker-J-Book.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Apache-Qpid-Broker-J-Book.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
index 18b4a8eae4..79d089b93d 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
index 5e54b2cec2..3be2cbc6d8 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
@@ -236,7 +236,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -244,7 +244,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Environment-Variables.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Environment-Variables.html
index 5422b18fe1..82f09924ea 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Environment-Variables.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Environment-Variables.html
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Operation-Logging.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Operation-Logging.html
index cf1b4a9e6a..a22774a7ca 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Operation-Logging.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Operation-Logging.html
@@ -562,7 +562,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -570,7 +570,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Queue-Alerts.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Queue-Alerts.html
index f3f2acd91e..2c4cf42454 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Queue-Alerts.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Queue-Alerts.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
index 40398f4b0c..482d2627a1 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
@@ -214,7 +214,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -222,7 +222,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Statistics-Reporting.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Statistics-Reporting.html
index 310becdf45..7c32eb1e3a 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Statistics-Reporting.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-Statistics-Reporting.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-System-Properties.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-System-Properties.html
index 55e991d4ba..6605da89c8 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-System-Properties.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Appendix-System-Properties.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
index f754530c2f..d3dff17097 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
index b2a376edbc..d4fc6639dc 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery.html
index 528caa3351..cc0032c3e8 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Backup-And-Recovery.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Authentication-Providers.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Authentication-Providers.html
index bfcce4821e..298ef04835 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Authentication-Providers.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Broker.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Broker.html
index baf547b63d..3dbbd2a812 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Broker.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Broker.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Exchanges.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Exchanges.html
index 02291fbe26..e0aefb6928 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Exchanges.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Exchanges.html
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -194,7 +194,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Other-Services.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Other-Services.html
index 5595713325..349d48515a 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Other-Services.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Other-Services.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Ports.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Ports.html
index f71089b2f6..3cce8aeaf4 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Ports.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Ports.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Queues.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Queues.html
index 00330ad585..b3dd929dab 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Queues.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Queues.html
@@ -303,7 +303,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -311,7 +311,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
index c588c17aa5..760d1ebb64 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
index 8aeb5b29fc..a0a3b536cb 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Virtualhosts.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Virtualhosts.html
index 45f11b7e7b..571dc67b18 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts-Virtualhosts.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts.html
index 346cd1862a..730b2d5cc5 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Concepts.html
@@ -159,7 +159,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Broker-Customization.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Broker-Customization.html
index ba96cef656..c1328e8ed7 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Broker-Customization.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Broker-Customization.html
@@ -259,7 +259,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -267,7 +267,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Broker-Users.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Broker-Users.html
index dd71c7b8bb..1c13fe57ce 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Broker-Users.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Broker-Users.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Running-The-Container.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Running-The-Container.html
index 1ca64b4f14..338c62f310 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Running-The-Container.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker-Running-The-Container.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker.html
index 3577b53ec4..1e4ab977bf 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Docker.html
@@ -163,7 +163,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -171,7 +171,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-CommandLine.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-CommandLine.html
index 71b564670c..8e9a85f569 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-CommandLine.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-CommandLine.html
@@ -182,7 +182,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Logging.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Logging.html
index 1b2d9afbf6..77a050c187 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Logging.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Logging.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
index 1c76c61593..594a503c33 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
index f441c4b44d..06cc32b805 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started.html
index 1053c56d1e..4fcec2bd23 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Getting-Started.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Backup.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Backup.html
index be6af9f2ed..21d50880c7 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Backup.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Backup.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Behaviour.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Behaviour.html
index 994052e56e..fe619317fb 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Behaviour.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Behaviour.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-ClientFailover.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-ClientFailover.html
index 284fe75ec4..21f90499f4 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-ClientFailover.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-ClientFailover.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-CreatingGroup.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-CreatingGroup.html
index 5e549f8eac..5bb108b228 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-CreatingGroup.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-CreatingGroup.html
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-DiskSpace.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-DiskSpace.html
index 869b83f747..40316e9549 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-DiskSpace.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-DiskSpace.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Network-Requirements.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Network-Requirements.html
index 87617a90ab..1ddd419378 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Network-Requirements.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Network-Requirements.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-NodeOperations.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-NodeOperations.html
index 98b8eb5ee6..81b3ab872e 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-NodeOperations.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-NodeOperations.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-OverviewOfHA.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-OverviewOfHA.html
index 895e032494..cab10f9f64 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-OverviewOfHA.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
index e4f98027c9..296d8009c5 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Security.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Security.html
index bfa5367199..edea7c9339 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Security.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability-Security.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability.html
index 81d646d060..701c2512bf 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-High-Availability.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
index c9cf2808fd..7e40cf0011 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
index 8331450a4f..3806fae236 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Example.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Example.html
index c06b6c112f..86f0177696 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Example.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Example.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
index b73f780f9a..96204fca54 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Location.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Location.html
index 56d52cdd94..96aba0bab7 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Location.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Location.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Type.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Type.html
index 25744f63ab..f9917627ee 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Type.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration-Type.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration.html
index 62081e7beb..b37bc225ea 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Initial-Configuration.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-Download.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-Download.html
index c9a56ce300..ad138add2d 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-Download.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-Download.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-InstallationUnix.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-InstallationUnix.html
index cfc255804e..1287700faa 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-InstallationUnix.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-InstallationUnix.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-InstallationWindows.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-InstallationWindows.html
index b5e8b40358..5a3a2584db 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-InstallationWindows.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-InstallationWindows.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-OptionalDependencies.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-OptionalDependencies.html
index 9a44928ed6..897b5c4c02 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-OptionalDependencies.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-OptionalDependencies.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-Prerequistes.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-Prerequistes.html
index b74ec31a9b..1c02b6e525 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-Prerequistes.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation-Prerequistes.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation.html
index c773705873..cd78c17e1a 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Installation.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Introduction.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Introduction.html
index 00c6f93a39..4ab680f22f 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Introduction.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
index 7dfee0d50f..8d4c60e31a 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-REST-API.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-REST-API.html
index 44fc78a06a..955a279790 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-REST-API.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-REST-API.html
@@ -1935,7 +1935,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1943,7 +1943,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-Web-Console.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-Web-Console.html
index 4270eacdd0..2852110583 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-Web-Console.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel-Web-Console.html
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel.html
index 43d54f86b4..2f7dc880f1 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Channel.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
index d01951579e..16e290d5a1 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Authentication-Providers.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
index d09096d558..63c8cc08e9 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Broker.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Broker.html
index 29374bb469..ceaa262a99 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Broker.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Broker.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
index 49c5fbcc3a..aff35272c0 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Consumers.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Consumers.html
index c36b3b4958..b0092d344f 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Consumers.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Consumers.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Entities.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Entities.html
index dc9fcf8096..9c487e80ff 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Entities.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Entities.html
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Exchanges.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Exchanges.html
index 8fbdf7daa2..d3a8ea4342 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Exchanges.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Exchanges.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Group-Providers.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Group-Providers.html
index 68ddffb4d9..2534448afe 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Group-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Group-Providers.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Keystores.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Keystores.html
index 13c11808f4..f0bd36eccc 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Keystores.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Keystores.html
@@ -170,7 +170,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index 21b1033b12..66e50cb8db 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Ports.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Ports.html
index d50978327d..4fb4222ed9 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Ports.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Ports.html
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Producers.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Producers.html
index 5577ef0ecb..612e9293ab 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Producers.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Producers.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Queues.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Queues.html
index 03f651a1d5..0d56a84be9 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Queues.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Queues.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index f291007c64..c37e294f1e 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Truststores.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Truststores.html
index 8c1aa781d2..fab7e33e35 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Truststores.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Truststores.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index be047fefd9..c0e4fb051c 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Virtualhosts.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Virtualhosts.html
index cbceef5f09..15b00fe339 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Managing-Virtualhosts.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Metrics.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Metrics.html
index a13867eae4..8d34592457 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Metrics.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Management-Metrics.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index b4f1acae68..89e182c425 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Miscellaneous.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Miscellaneous.html
index 2d2c291a12..f41cb37721 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Miscellaneous.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Miscellaneous.html
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Background-Recovery.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Background-Recovery.html
index 87bbbc7f10..56a8817da0 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Background-Recovery.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Background-Recovery.html
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index acd6955604..94f52214da 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Connection-Limit.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Connection-Limit.html
index b43f9be72f..bf3f1c5fff 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Connection-Limit.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Connection-Limit.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Consumers.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Consumers.html
index 0c6cb03ddb..64d08c0b3d 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Consumers.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Consumers.html
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Disk-Space-Management.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Disk-Space-Management.html
index a965c22d37..b0d45802cb 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Disk-Space-Management.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Flow-To-Disk.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Flow-To-Disk.html
index 87708f09ec..27427d4566 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Flow-To-Disk.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index 6039376ab9..8b236009cc 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
@@ -176,7 +176,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Instrumentation.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Instrumentation.html
index ca26936998..1fb47d7783 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Instrumentation.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Instrumentation.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Memory.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Memory.html
index 636478312f..7ab12aac41 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Memory.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Memory.html
@@ -260,7 +260,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -268,7 +268,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Message-Compression.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Message-Compression.html
index dcf45f2382..66a1c74b2d 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Message-Compression.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Message-Compression.html
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Transaction-Timeout.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Transaction-Timeout.html
index c428d44a3e..9fdff86284 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Transaction-Timeout.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime-Transaction-Timeout.html
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime.html
index 87763d673a..8fd943fe64 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Runtime.html
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -239,7 +239,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-AccessControlProviders.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-AccessControlProviders.html
index 48262f1826..8c16f64909 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-AccessControlProviders.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-AccessControlProviders.html
@@ -353,7 +353,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -361,7 +361,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-Configuration-Encryption.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-Configuration-Encryption.html
index 51051d2e12..f49b393e84 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-Configuration-Encryption.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-Configuration-Encryption.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-ConnectionLimitProviders.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-ConnectionLimitProviders.html
index 9635dce717..52e5d7bdff 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-ConnectionLimitProviders.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-ConnectionLimitProviders.html
@@ -265,7 +265,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -273,7 +273,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-Group-Providers.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-Group-Providers.html
index 4b615d8178..e0101d5f43 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-Group-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security-Group-Providers.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security.html
index 04ef049d22..d539d44d2d 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Security.html
@@ -306,7 +306,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -314,7 +314,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
index 5afc9b4827..3a24f81237 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/apds02.html b/content/releases/qpid-broker-j-10.0.0/book/apds02.html
index 050d3bd13c..556945dfed 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/apds02.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/apds02.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/apds03.html b/content/releases/qpid-broker-j-10.0.0/book/apds03.html
index d0527b9398..2323538376 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/apds03.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/apds03.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/book/index.html b/content/releases/qpid-broker-j-10.0.0/book/index.html
index 3e6c3910ea..b933c026fb 100644
--- a/content/releases/qpid-broker-j-10.0.0/book/index.html
+++ b/content/releases/qpid-broker-j-10.0.0/book/index.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/index.html b/content/releases/qpid-broker-j-10.0.0/index.html
index 80a904f258..c4b5fdb15e 100644
--- a/content/releases/qpid-broker-j-10.0.0/index.html
+++ b/content/releases/qpid-broker-j-10.0.0/index.html
@@ -207,7 +207,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -215,7 +215,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.0/release-notes.html b/content/releases/qpid-broker-j-10.0.0/release-notes.html
index 4a8482545e..80b359619e 100644
--- a/content/releases/qpid-broker-j-10.0.0/release-notes.html
+++ b/content/releases/qpid-broker-j-10.0.0/release-notes.html
@@ -174,7 +174,7 @@ <h2 id="dependency-updates">Dependency updates</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h2 id="dependency-updates">Dependency updates</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Apache-Qpid-Broker-J-Book.html b/content/releases/qpid-broker-j-10.0.1/book/Apache-Qpid-Broker-J-Book.html
index aa379f7641..ea4eb80a0c 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Apache-Qpid-Broker-J-Book.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Apache-Qpid-Broker-J-Book.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
index 2e92646fb3..1ae788081e 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
index ad9823c8eb..c3a3d06130 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
@@ -236,7 +236,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -244,7 +244,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Environment-Variables.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Environment-Variables.html
index e1553f3918..76cb7666ab 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Environment-Variables.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Environment-Variables.html
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Operation-Logging.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Operation-Logging.html
index 3c340e1acf..63efe139a4 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Operation-Logging.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Operation-Logging.html
@@ -562,7 +562,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -570,7 +570,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Queue-Alerts.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Queue-Alerts.html
index fb83aad12b..a88e59d0fd 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Queue-Alerts.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Queue-Alerts.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Queue-Declare-Arguments.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
index 1614f88905..ca549b7c97 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
@@ -214,7 +214,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -222,7 +222,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Statistics-Reporting.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Statistics-Reporting.html
index 65976b4093..1142ce8675 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Statistics-Reporting.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-Statistics-Reporting.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-System-Properties.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-System-Properties.html
index 285001e9a1..49b6283036 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-System-Properties.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Appendix-System-Properties.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
index 3d62914cd3..db3aaca134 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery-Virtualhost.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
index dbbd1b984f..17564204d9 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery.html
index 397023fa38..e2338b9f3f 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Backup-And-Recovery.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Authentication-Providers.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Authentication-Providers.html
index 4a5a96e47c..577a512c5d 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Authentication-Providers.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Broker.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Broker.html
index 5076e2d0da..b53c9cff19 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Broker.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Broker.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Exchanges.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Exchanges.html
index af1b06cdcd..382d49b8fc 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Exchanges.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Exchanges.html
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -194,7 +194,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Other-Services.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Other-Services.html
index 382e903762..7f74ba9322 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Other-Services.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Other-Services.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Ports.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Ports.html
index 9620ad1875..4f739023bd 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Ports.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Ports.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Queues.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Queues.html
index cf32166bec..1a033d031f 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Queues.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Queues.html
@@ -303,7 +303,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -311,7 +311,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-RemoteReplicationNodes.html
index 3826b3bfec..3e5ecbcb2b 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-RemoteReplicationNodes.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Virtualhost-Nodes.html
index bfd3b57d8a..577c14b54c 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Virtualhost-Nodes.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Virtualhosts.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Virtualhosts.html
index 395ff4f289..16d4e7b490 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts-Virtualhosts.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts.html
index eb48e4689c..159aca5d8d 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Concepts.html
@@ -159,7 +159,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Broker-Customization.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Broker-Customization.html
index 55c8c9fd94..5548aeea1a 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Broker-Customization.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Broker-Customization.html
@@ -259,7 +259,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -267,7 +267,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Broker-Users.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Broker-Users.html
index 856a52e466..c70ef07385 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Broker-Users.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Broker-Users.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Running-The-Container.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Running-The-Container.html
index f5b27f39f5..f6804c9f8e 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Running-The-Container.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker-Running-The-Container.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker.html
index 0547b59ec3..397f9d7456 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Docker.html
@@ -163,7 +163,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -171,7 +171,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-CommandLine.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-CommandLine.html
index 62ac5ece96..75d2e976b1 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-CommandLine.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-CommandLine.html
@@ -182,7 +182,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Logging.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Logging.html
index 68e0bb667a..9e3755a358 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Logging.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Logging.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
index 00de3c10a1..388587efc4 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
index 32fc65cf5f..b952fde41a 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started.html
index 867cb3165c..db709ec2bd 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Getting-Started.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Backup.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Backup.html
index ce8da78b37..67d9bfaeef 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Backup.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Backup.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Behaviour.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Behaviour.html
index 1578348162..1074e95e7b 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Behaviour.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Behaviour.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-ClientFailover.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-ClientFailover.html
index 7293744e14..4e43d5e169 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-ClientFailover.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-ClientFailover.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-CreatingGroup.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-CreatingGroup.html
index 69b994e6c2..434f40d9d1 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-CreatingGroup.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-CreatingGroup.html
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-DiskSpace.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-DiskSpace.html
index 35dfc4a266..6cc087e476 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-DiskSpace.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-DiskSpace.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Network-Requirements.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Network-Requirements.html
index b2ccf73a5c..3990c42300 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Network-Requirements.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Network-Requirements.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-NodeOperations.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-NodeOperations.html
index 903574e84a..adb048f33d 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-NodeOperations.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-NodeOperations.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-OverviewOfHA.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-OverviewOfHA.html
index b0b957a318..4d7e434338 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-OverviewOfHA.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Reset-Group-Infomational.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
index 972729a270..4b8452b636 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Security.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Security.html
index b58350c697..74ffccbe7a 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Security.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability-Security.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability.html
index d70a6c57a6..c7defeb33e 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-High-Availability.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Configuration-Properties.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
index 729d0a7f46..f76532724e 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
index 3bf0b4846a..3ec6319ac5 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Example.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Example.html
index 8a1de2f11e..1512e2a62e 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Example.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Example.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
index fab512b885..ccc970ef4a 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Location.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Location.html
index e5a1af41a0..6e17e929ee 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Location.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Location.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Type.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Type.html
index de30aafd33..fa2cb4b503 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Type.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration-Type.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration.html
index b97b357d04..eb025ae575 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Initial-Configuration.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-Download.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-Download.html
index d9b13e191f..a49fd96033 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-Download.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-Download.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-InstallationUnix.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-InstallationUnix.html
index 1cf1ab9d8b..6ee3ae4f39 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-InstallationUnix.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-InstallationUnix.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-InstallationWindows.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-InstallationWindows.html
index 04197bf843..568d5944d8 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-InstallationWindows.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-InstallationWindows.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-OptionalDependencies.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-OptionalDependencies.html
index da2247d4d7..5611883586 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-OptionalDependencies.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-OptionalDependencies.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-Prerequistes.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-Prerequistes.html
index 7643c94407..6b95ad9b60 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-Prerequistes.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation-Prerequistes.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation.html
index 8a4e69f50b..68fcf2a11f 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Installation.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Introduction.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Introduction.html
index 3fad694295..60f86667b9 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Introduction.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
index 4382af5b80..f2811e9f04 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-REST-API.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-REST-API.html
index b2053b0ca9..438f02a559 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-REST-API.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-REST-API.html
@@ -1935,7 +1935,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1943,7 +1943,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-Web-Console.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-Web-Console.html
index 8c7930721f..e07c844812 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-Web-Console.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel-Web-Console.html
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel.html
index c8b96ccc3d..4a736ff317 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Channel.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Access-Control-Providers.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Access-Control-Providers.html
index d446f6929c..1a9051a96c 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Access-Control-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Access-Control-Providers.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Authentication-Providers.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Authentication-Providers.html
index 25d8d94f72..fbde76fc32 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Authentication-Providers.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Broker.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Broker.html
index 355ca412fe..2ea068ddc8 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Broker.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Broker.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
index 5b3db66075..792391e688 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Consumers.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Consumers.html
index bcebe6c41f..9c308d2508 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Consumers.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Consumers.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Entities.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Entities.html
index abd78b1bb9..1e74a81d0d 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Entities.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Entities.html
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Exchanges.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Exchanges.html
index 02c62725a0..e0785b22fa 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Exchanges.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Exchanges.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Group-Providers.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Group-Providers.html
index 90308bfee1..177bb5d0aa 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Group-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Group-Providers.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Keystores.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Keystores.html
index 57eb783a30..1c9bfbe0e2 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Keystores.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Keystores.html
@@ -170,7 +170,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Plugin-HTTP.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index 362ae66030..e7f767eca1 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Plugin-HTTP.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Ports.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Ports.html
index 1c8307d7b1..c4f288e017 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Ports.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Ports.html
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Producers.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Producers.html
index 9e847acede..c8c72f376e 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Producers.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Producers.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Queues.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Queues.html
index 2e41670e73..c198db2efc 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Queues.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Queues.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index a7e19d36c3..31c5373e55 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Truststores.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Truststores.html
index 164d54ce2a..f84dfc90e7 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Truststores.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Truststores.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index 252a7f8bd2..41ab5282e4 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Virtualhosts.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Virtualhosts.html
index b7e89660ca..75a2e69da2 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Managing-Virtualhosts.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Metrics.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Metrics.html
index a7e44f5839..132c796b41 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Metrics.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Management-Metrics.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index 4221e7c6c8..178fcd5c3c 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Miscellaneous.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Miscellaneous.html
index 105b04e0fb..b182fa4fd0 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Miscellaneous.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Miscellaneous.html
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Background-Recovery.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Background-Recovery.html
index 18a1056beb..bc9e5e4f14 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Background-Recovery.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Background-Recovery.html
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index 9732c38db4..1bb66f2df0 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Connection-Limit.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Connection-Limit.html
index f3032f76fc..9242f7d524 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Connection-Limit.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Connection-Limit.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Consumers.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Consumers.html
index a0743b9a7a..013b17c7a7 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Consumers.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Consumers.html
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Disk-Space-Management.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Disk-Space-Management.html
index a133d9b25c..5792e5dac0 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Disk-Space-Management.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Flow-To-Disk.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Flow-To-Disk.html
index 54b32affd0..a7bf1cd246 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Flow-To-Disk.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index 7db5f86614..f25ce99b01 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
@@ -176,7 +176,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Instrumentation.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Instrumentation.html
index 4a9198f0b1..07f3e711bf 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Instrumentation.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Instrumentation.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Memory.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Memory.html
index 352d8b501b..a35c0c1f8c 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Memory.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Memory.html
@@ -260,7 +260,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -268,7 +268,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Message-Compression.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Message-Compression.html
index d92fd780f3..e9b990a55a 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Message-Compression.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Message-Compression.html
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Transaction-Timeout.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Transaction-Timeout.html
index 4938501494..18751dd5ea 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Transaction-Timeout.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime-Transaction-Timeout.html
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime.html
index cbf9ad69ee..fb99c09824 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Runtime.html
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -239,7 +239,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-AccessControlProviders.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-AccessControlProviders.html
index 27dac5fcc7..5d75de756f 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-AccessControlProviders.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-AccessControlProviders.html
@@ -353,7 +353,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -361,7 +361,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-Configuration-Encryption.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-Configuration-Encryption.html
index 319f35c25b..346484d061 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-Configuration-Encryption.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-Configuration-Encryption.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-ConnectionLimitProviders.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-ConnectionLimitProviders.html
index a66af0ed88..6004f73967 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-ConnectionLimitProviders.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-ConnectionLimitProviders.html
@@ -265,7 +265,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -273,7 +273,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-Group-Providers.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-Group-Providers.html
index df8a6ddc97..116689743a 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-Group-Providers.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security-Group-Providers.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security.html
index c2dfb6ec88..078a884bbb 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Security.html
@@ -306,7 +306,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -314,7 +314,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Virtual-Host-Initial-Configuration.html b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Virtual-Host-Initial-Configuration.html
index 658a50d43f..0724822b19 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Virtual-Host-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/Java-Broker-Virtual-Host-Initial-Configuration.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/apds02.html b/content/releases/qpid-broker-j-10.0.1/book/apds02.html
index 63e922787c..9aafec7caf 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/apds02.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/apds02.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/apds03.html b/content/releases/qpid-broker-j-10.0.1/book/apds03.html
index 8b5cd45c6d..eabf164698 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/apds03.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/apds03.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/book/index.html b/content/releases/qpid-broker-j-10.0.1/book/index.html
index f2d801dc3b..ca0d9db122 100644
--- a/content/releases/qpid-broker-j-10.0.1/book/index.html
+++ b/content/releases/qpid-broker-j-10.0.1/book/index.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/index.html b/content/releases/qpid-broker-j-10.0.1/index.html
index aa7f62cae0..656fae9147 100644
--- a/content/releases/qpid-broker-j-10.0.1/index.html
+++ b/content/releases/qpid-broker-j-10.0.1/index.html
@@ -207,7 +207,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -215,7 +215,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.0.1/release-notes.html b/content/releases/qpid-broker-j-10.0.1/release-notes.html
index 1e6b231fc3..224674de55 100644
--- a/content/releases/qpid-broker-j-10.0.1/release-notes.html
+++ b/content/releases/qpid-broker-j-10.0.1/release-notes.html
@@ -160,7 +160,7 @@ <h2 id="dependency-updates">Dependency updates</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h2 id="dependency-updates">Dependency updates</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Apache-Qpid-Broker-J-Book.html b/content/releases/qpid-broker-j-10.1.0/book/Apache-Qpid-Broker-J-Book.html
index 4aae711943..452a217b2a 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Apache-Qpid-Broker-J-Book.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Apache-Qpid-Broker-J-Book.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
index a8eaf0011e..5f1a99200f 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
index f22f3f4bb7..b2ad3082be 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
@@ -236,7 +236,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -244,7 +244,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Environment-Variables.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Environment-Variables.html
index 9c90c923d2..d223e1700f 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Environment-Variables.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Environment-Variables.html
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Operation-Logging.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Operation-Logging.html
index c746064019..0fe187f441 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Operation-Logging.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Operation-Logging.html
@@ -562,7 +562,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -570,7 +570,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Queue-Alerts.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Queue-Alerts.html
index 9afaa7c130..cb006f93e7 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Queue-Alerts.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Queue-Alerts.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
index f31b48191e..c5db334666 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
@@ -214,7 +214,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -222,7 +222,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Statistics-Reporting.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Statistics-Reporting.html
index 06bc8c84b5..ab110370e8 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Statistics-Reporting.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-Statistics-Reporting.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-System-Properties.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-System-Properties.html
index 1637e2fc08..d6cd93a882 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-System-Properties.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Appendix-System-Properties.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
index c19de800d6..ac2f5650a3 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
index b6e29c5649..3018b110a0 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery.html
index c821af44bc..68e5fffca8 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Backup-And-Recovery.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Authentication-Providers.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Authentication-Providers.html
index c419312129..6b2e6d6f55 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Authentication-Providers.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Broker.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Broker.html
index 36fc08dc1e..9420592763 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Broker.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Broker.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Exchanges.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Exchanges.html
index 365d57c404..e030b39bd2 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Exchanges.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Exchanges.html
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -194,7 +194,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Other-Services.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Other-Services.html
index 7b5280cc81..46c2ebd276 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Other-Services.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Other-Services.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Ports.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Ports.html
index 1c1371be71..59aaeee0a3 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Ports.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Ports.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Queues.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Queues.html
index 620ddb8930..af53503fe3 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Queues.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Queues.html
@@ -303,7 +303,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -311,7 +311,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
index 4cc8322536..aca3463fd1 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
index 42f7cbd74d..a3645b5a12 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Virtualhosts.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Virtualhosts.html
index de3e7dc3cd..9b6a293b4e 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts-Virtualhosts.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts.html
index 2531f01179..2ade443bd6 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Concepts.html
@@ -159,7 +159,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Broker-Customization.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Broker-Customization.html
index 009eba79c0..6a5a7e6223 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Broker-Customization.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Broker-Customization.html
@@ -259,7 +259,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -267,7 +267,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Broker-Users.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Broker-Users.html
index fbb54f56ab..10bf80bc9b 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Broker-Users.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Broker-Users.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Running-The-Container.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Running-The-Container.html
index cb61a9b44b..8cef86fd78 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Running-The-Container.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker-Running-The-Container.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker.html
index f7262b3638..841a59148a 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Docker.html
@@ -163,7 +163,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -171,7 +171,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-CommandLine.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-CommandLine.html
index b98187c236..dbfd179602 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-CommandLine.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-CommandLine.html
@@ -182,7 +182,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Logging.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Logging.html
index a336153cfa..576cbd306a 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Logging.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Logging.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
index ae1da3ee66..fd555776f1 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
index ee0eec94d1..9adf685c62 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started.html
index 88164714e4..167ed13ee7 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Getting-Started.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Backup.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Backup.html
index 4d45548633..0f55ef4a86 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Backup.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Backup.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Behaviour.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Behaviour.html
index 620050fdc8..31ee75e6e3 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Behaviour.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Behaviour.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-ClientFailover.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-ClientFailover.html
index a6d07dd803..5c399c1007 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-ClientFailover.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-ClientFailover.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-CreatingGroup.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-CreatingGroup.html
index 97d99f0f46..7357fd3ef5 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-CreatingGroup.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-CreatingGroup.html
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-DiskSpace.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-DiskSpace.html
index 069586f6ef..6b936a4883 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-DiskSpace.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-DiskSpace.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Network-Requirements.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Network-Requirements.html
index d6317d5594..e7e61453c0 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Network-Requirements.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Network-Requirements.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-NodeOperations.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-NodeOperations.html
index bd7a1353b5..6d31a797c2 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-NodeOperations.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-NodeOperations.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-OverviewOfHA.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-OverviewOfHA.html
index 107a941d0b..a7b7f182f6 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-OverviewOfHA.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
index 145f4cdb9d..e1fadfc48d 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Security.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Security.html
index c990345cb0..b753bbecf0 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Security.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability-Security.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability.html
index 827b41463b..894260d505 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-High-Availability.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
index a06611feca..802093e991 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
index 1bd19f67c4..55a415e87e 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Example.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Example.html
index a9700076d6..eb34bd77fb 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Example.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Example.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
index 5637e44e2e..aa751fbcb8 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Location.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Location.html
index 32d7c53a65..cea7055871 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Location.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Location.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Type.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Type.html
index 7ce06b251b..abd1d3c866 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Type.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration-Type.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration.html
index e2993de906..0203b607d9 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Initial-Configuration.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-Download.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-Download.html
index 6793689bc3..84b5901dde 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-Download.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-Download.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-InstallationUnix.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-InstallationUnix.html
index 229955089d..7467f645fe 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-InstallationUnix.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-InstallationUnix.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-InstallationWindows.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-InstallationWindows.html
index a3e3b09f4a..bdec5ff735 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-InstallationWindows.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-InstallationWindows.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-OptionalDependencies.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-OptionalDependencies.html
index d7786b0268..2cbe707ef2 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-OptionalDependencies.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-OptionalDependencies.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-Prerequistes.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-Prerequistes.html
index b61d66d850..95dc5e28cb 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-Prerequistes.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation-Prerequistes.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation.html
index 53ce882e2c..fa5ef7c16b 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Installation.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Introduction.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Introduction.html
index 269cee1906..a15402e60e 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Introduction.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
index d8861f783c..59821d3d77 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-REST-API.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-REST-API.html
index 883356f7a1..d5c9e5b583 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-REST-API.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-REST-API.html
@@ -1935,7 +1935,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1943,7 +1943,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-Web-Console.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-Web-Console.html
index 00689a5096..98afd85077 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-Web-Console.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel-Web-Console.html
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel.html
index e83f29d54a..4d3872cdd4 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Channel.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
index 4e1a04eb18..07e9eb922a 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Authentication-Providers.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
index a700d04007..722995ce66 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Broker.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Broker.html
index f620a80028..229c23e3df 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Broker.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Broker.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
index c7099bbe17..ee2fb8f588 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Consumers.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Consumers.html
index b49c0aadce..2eac1bdbb6 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Consumers.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Consumers.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Entities.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Entities.html
index d489e9a66f..ae1d6a4f46 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Entities.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Entities.html
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Exchanges.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Exchanges.html
index f17cec66b2..1bba554109 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Exchanges.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Exchanges.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Group-Providers.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Group-Providers.html
index 2337789d3e..5f5f4dc111 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Group-Providers.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Group-Providers.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Keystores.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Keystores.html
index 4c37830c8f..9d12c2ba8b 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Keystores.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Keystores.html
@@ -170,7 +170,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index 613a56308d..9076eaee81 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Ports.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Ports.html
index bdfbc35d9d..78761cd832 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Ports.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Ports.html
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Producers.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Producers.html
index 6eb62f6976..5267791e8a 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Producers.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Producers.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Queues.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Queues.html
index 50cbedb282..590c5be0ca 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Queues.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Queues.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index 2aaf9c8480..796384db61 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Truststores.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Truststores.html
index f5df1bc3c4..9d2035b636 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Truststores.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Truststores.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index a5e59bf010..90343a8f1e 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Virtualhosts.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Virtualhosts.html
index a5b399a51a..dafada8830 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Managing-Virtualhosts.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Metrics.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Metrics.html
index 15e4dddc53..91d85d153e 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Metrics.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Management-Metrics.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index 9f08e5df7a..baf0a76495 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Miscellaneous.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Miscellaneous.html
index 65135c0c08..2cabf75df7 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Miscellaneous.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Miscellaneous.html
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Background-Recovery.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Background-Recovery.html
index 2bb6884663..743b8ea90c 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Background-Recovery.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Background-Recovery.html
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index a7538e5da9..d0c49c717a 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Connection-Limit.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Connection-Limit.html
index 04d665016d..ece2e8cfea 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Connection-Limit.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Connection-Limit.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Consumers.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Consumers.html
index 5d1f0a46ca..9bbd1df937 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Consumers.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Consumers.html
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Disk-Space-Management.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Disk-Space-Management.html
index 993c507251..7b3f50f02b 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Disk-Space-Management.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Flow-To-Disk.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Flow-To-Disk.html
index fb8a4694fb..5412662c0b 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Flow-To-Disk.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index 951bdf61c8..fb1446a635 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
@@ -176,7 +176,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Instrumentation.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Instrumentation.html
index 618ebf486c..579b304e5b 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Instrumentation.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Instrumentation.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Memory.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Memory.html
index 3ea9ad0dee..1a54d49300 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Memory.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Memory.html
@@ -260,7 +260,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -268,7 +268,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Message-Compression.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Message-Compression.html
index 3f6fa4d378..929f92a540 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Message-Compression.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Message-Compression.html
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Transaction-Timeout.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Transaction-Timeout.html
index 7c6c516789..525de47194 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Transaction-Timeout.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime-Transaction-Timeout.html
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime.html
index c3b2b6323c..2d50659fb4 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Runtime.html
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -239,7 +239,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-AccessControlProviders.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-AccessControlProviders.html
index a03817c41e..458ce81094 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-AccessControlProviders.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-AccessControlProviders.html
@@ -353,7 +353,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -361,7 +361,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-Configuration-Encryption.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-Configuration-Encryption.html
index 39bafafd6c..6bf1d12c8a 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-Configuration-Encryption.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-Configuration-Encryption.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-ConnectionLimitProviders.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-ConnectionLimitProviders.html
index b487d0f1fc..5578d9303a 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-ConnectionLimitProviders.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-ConnectionLimitProviders.html
@@ -265,7 +265,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -273,7 +273,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-Group-Providers.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-Group-Providers.html
index 1a5bc697ec..dc47f09aec 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-Group-Providers.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security-Group-Providers.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security.html
index 278bf071e7..9ce154a911 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Security.html
@@ -306,7 +306,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -314,7 +314,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
index 6e76896ffc..1e511f7177 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/apds02.html b/content/releases/qpid-broker-j-10.1.0/book/apds02.html
index 4a5055c667..0e5117145f 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/apds02.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/apds02.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/apds03.html b/content/releases/qpid-broker-j-10.1.0/book/apds03.html
index 90a5655933..e2aea5ad9b 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/apds03.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/apds03.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/book/index.html b/content/releases/qpid-broker-j-10.1.0/book/index.html
index 091142a6ec..a4ec0db25d 100644
--- a/content/releases/qpid-broker-j-10.1.0/book/index.html
+++ b/content/releases/qpid-broker-j-10.1.0/book/index.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/index.html b/content/releases/qpid-broker-j-10.1.0/index.html
index 45187408b5..77b0b3ad4f 100644
--- a/content/releases/qpid-broker-j-10.1.0/index.html
+++ b/content/releases/qpid-broker-j-10.1.0/index.html
@@ -207,7 +207,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -215,7 +215,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-10.1.0/release-notes.html b/content/releases/qpid-broker-j-10.1.0/release-notes.html
index 53392f8849..b537954a90 100644
--- a/content/releases/qpid-broker-j-10.1.0/release-notes.html
+++ b/content/releases/qpid-broker-j-10.1.0/release-notes.html
@@ -170,7 +170,7 @@ <h2 id="dependency-updates">Dependency updates</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h2 id="dependency-updates">Dependency updates</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Apache-Qpid-Broker-J-Book.html b/content/releases/qpid-broker-j-8.0.6/book/Apache-Qpid-Broker-J-Book.html
index ee1ed45700..1f512e13af 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Apache-Qpid-Broker-J-Book.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Apache-Qpid-Broker-J-Book.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
index ff369de2ea..55a9432cb1 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
index be73d48c9f..37b115f96a 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
@@ -236,7 +236,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -244,7 +244,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Environment-Variables.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Environment-Variables.html
index 7f6ce4f313..f6c2a7ffd1 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Environment-Variables.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Environment-Variables.html
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Operation-Logging.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Operation-Logging.html
index 9606849c4c..70447cefc8 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Operation-Logging.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Operation-Logging.html
@@ -541,7 +541,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -549,7 +549,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Queue-Alerts.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Queue-Alerts.html
index 41ce4f6129..e942f9f027 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Queue-Alerts.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Queue-Alerts.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Queue-Declare-Arguments.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
index 8531639b0d..47f9dafccb 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
@@ -214,7 +214,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -222,7 +222,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Statistics-Reporting.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Statistics-Reporting.html
index 9d5c1bdbfb..f32bde51f6 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Statistics-Reporting.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-Statistics-Reporting.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-System-Properties.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-System-Properties.html
index b2cdd6d33f..dda852916a 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-System-Properties.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Appendix-System-Properties.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
index 781bac7154..964afddf4e 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery-Virtualhost.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
index 23c6cedf2d..368463c9f1 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery.html
index d612d2bac3..5a8593a2d4 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Backup-And-Recovery.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Authentication-Providers.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Authentication-Providers.html
index 258736688c..b54b02967d 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Authentication-Providers.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Broker.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Broker.html
index 79d96b2d07..dc0590df26 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Broker.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Broker.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Exchanges.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Exchanges.html
index e22f0ba0b5..8655da7e59 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Exchanges.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Exchanges.html
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -194,7 +194,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Other-Services.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Other-Services.html
index 835f6b8ea5..b1aaf1e13e 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Other-Services.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Other-Services.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Ports.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Ports.html
index fcc71c17a6..fe0885c6e6 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Ports.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Ports.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Queues.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Queues.html
index 9f41bc8232..ac09b8a0d5 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Queues.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Queues.html
@@ -303,7 +303,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -311,7 +311,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-RemoteReplicationNodes.html
index 0bc24fba3a..c2820c3f28 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-RemoteReplicationNodes.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Virtualhost-Nodes.html
index 23ad425522..2fe09747fa 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Virtualhost-Nodes.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Virtualhosts.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Virtualhosts.html
index 1bce98b97c..40fec4004c 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts-Virtualhosts.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts.html
index 0abbbd7ff4..91ea0c3996 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Concepts.html
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-CommandLine.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-CommandLine.html
index ad8cb5930c..38d007217f 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-CommandLine.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-CommandLine.html
@@ -182,7 +182,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Logging.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Logging.html
index 7c96c0fd02..8c08c1821d 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Logging.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Logging.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
index 6d2b7979b8..ac9fba5281 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
index f1f7baeeab..63b143b31e 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started.html
index 50c0feb956..2cdc09c7d8 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Getting-Started.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Backup.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Backup.html
index 7a9d0700fc..3922ce3523 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Backup.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Backup.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Behaviour.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Behaviour.html
index b23f9337b1..436f6f4564 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Behaviour.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Behaviour.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-ClientFailover.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-ClientFailover.html
index e14171ef29..4824c142e3 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-ClientFailover.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-ClientFailover.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-CreatingGroup.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-CreatingGroup.html
index 0c51c83344..075ccbd821 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-CreatingGroup.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-CreatingGroup.html
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-DiskSpace.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-DiskSpace.html
index ed17b02716..4e14845914 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-DiskSpace.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-DiskSpace.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Network-Requirements.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Network-Requirements.html
index 0caf354dd4..68a8e2329e 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Network-Requirements.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Network-Requirements.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-NodeOperations.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-NodeOperations.html
index 7809312109..ac81826f92 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-NodeOperations.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-NodeOperations.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-OverviewOfHA.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-OverviewOfHA.html
index a87dfb2c76..f87f1dc132 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-OverviewOfHA.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Reset-Group-Infomational.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
index bc5101764b..cb31e3a28e 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Security.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Security.html
index b8f70e2bd5..293acd5833 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Security.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability-Security.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability.html
index e74e11327f..5dc9ac516d 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-High-Availability.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Configuration-Properties.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
index 0831dbdd57..19c17ac8d3 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
index 4c7801a91b..322ae3912d 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Example.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Example.html
index 488cb1b048..b4a037317a 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Example.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Example.html
@@ -224,7 +224,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -232,7 +232,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
index c70679fdec..a59045a645 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Location.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Location.html
index 2c22c3258b..692558ba4a 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Location.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Location.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Type.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Type.html
index e22e14c1fa..d81d2f18a7 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Type.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration-Type.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration.html
index b8d71df15e..6c18fdd8ab 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Initial-Configuration.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-Download.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-Download.html
index 972d8c778f..999c3003b9 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-Download.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-Download.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-InstallationUnix.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-InstallationUnix.html
index 2ef67b6248..6409b8ca33 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-InstallationUnix.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-InstallationUnix.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-InstallationWindows.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-InstallationWindows.html
index c119332df5..c946677ce9 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-InstallationWindows.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-InstallationWindows.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-OptionalDependencies.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-OptionalDependencies.html
index baf2a266cd..72134e6c19 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-OptionalDependencies.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-OptionalDependencies.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-Prerequistes.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-Prerequistes.html
index 38ae0ac49f..7de426ebdd 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-Prerequistes.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation-Prerequistes.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation.html
index 447d62cdf5..66d3ba8198 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Installation.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Introduction.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Introduction.html
index 7401c1f201..23b54c8c9a 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Introduction.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
index 30782e6f46..832a1b379d 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-REST-API.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-REST-API.html
index 66c7fb81a2..ae963541c9 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-REST-API.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-REST-API.html
@@ -375,7 +375,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -383,7 +383,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-Web-Console.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-Web-Console.html
index 74cbe84c03..de4bb52b6d 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-Web-Console.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel-Web-Console.html
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel.html
index a7953006b7..39fb8823cd 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Channel.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Access-Control-Providers.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Access-Control-Providers.html
index f9f8ecfcc6..bd7e4555ea 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Access-Control-Providers.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Access-Control-Providers.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Authentication-Providers.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Authentication-Providers.html
index 3b8c9606ca..8ecc9aa0ac 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Authentication-Providers.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Broker.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Broker.html
index be60756f6b..3c16a983f9 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Broker.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Broker.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Consumers.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Consumers.html
index 47b713693c..f269317df5 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Consumers.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Consumers.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Entities.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Entities.html
index 30dbb56a3a..f96cc65fb9 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Entities.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Entities.html
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Exchanges.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Exchanges.html
index 64816a16d9..a42ace3c19 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Exchanges.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Exchanges.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Group-Providers.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Group-Providers.html
index bc75455cd1..ab2b86be12 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Group-Providers.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Group-Providers.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Keystores.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Keystores.html
index 90216856a3..0da267c3b9 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Keystores.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Keystores.html
@@ -170,7 +170,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Plugin-HTTP.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index 02a7f46a77..1e0a338010 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Plugin-HTTP.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Ports.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Ports.html
index 640cd39ac4..eb8d884788 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Ports.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Ports.html
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Queues.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Queues.html
index 81c4f8c7d0..02ae106309 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Queues.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Queues.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index 6e7cc0e677..b0238aad26 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Truststores.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Truststores.html
index cd4c9b39cf..41b9f09d95 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Truststores.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Truststores.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index 9e1e63c497..a8fb95b109 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Virtualhosts.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Virtualhosts.html
index 123059f16b..8b8f58dcc5 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Managing-Virtualhosts.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Metrics.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Metrics.html
index 4d48b53bad..1fd64f88f7 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Metrics.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Management-Metrics.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index b909e6c7f7..11899f6cc1 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Miscellaneous.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Miscellaneous.html
index 9dd368a623..ce1fc5b923 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Miscellaneous.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Miscellaneous.html
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Background-Recovery.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Background-Recovery.html
index 73ce22fc77..3289071425 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Background-Recovery.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Background-Recovery.html
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index b994edf51b..2c21ab31cf 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Connection-Limit.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Connection-Limit.html
index 9e2a1368ce..c9576aa589 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Connection-Limit.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Connection-Limit.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Consumers.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Consumers.html
index 5b072d5b5a..317535a595 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Consumers.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Consumers.html
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Disk-Space-Management.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Disk-Space-Management.html
index 8167ded756..c56c37c16f 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Disk-Space-Management.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Flow-To-Disk.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Flow-To-Disk.html
index 6be71b4098..61e1fca56b 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Flow-To-Disk.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index 6c8243bea7..68c9090d74 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
@@ -176,7 +176,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Memory.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Memory.html
index af931fb66f..31df00ce85 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Memory.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Memory.html
@@ -262,7 +262,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -270,7 +270,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Message-Compression.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Message-Compression.html
index 6b32d5ed2b..7acae713ce 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Message-Compression.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Message-Compression.html
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Transaction-Timeout.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Transaction-Timeout.html
index b95b35bd60..9247f27469 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Transaction-Timeout.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime-Transaction-Timeout.html
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime.html
index 228951a1b1..f42cd30491 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Runtime.html
@@ -221,7 +221,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -229,7 +229,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-AccessControlProviders.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-AccessControlProviders.html
index dd840bee2e..16cb948928 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-AccessControlProviders.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-AccessControlProviders.html
@@ -380,7 +380,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -388,7 +388,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-Configuration-Encryption.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-Configuration-Encryption.html
index f4be16e73f..a14e7e4876 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-Configuration-Encryption.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-Configuration-Encryption.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-Group-Providers.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-Group-Providers.html
index 65acc979b2..2484c6c838 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-Group-Providers.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security-Group-Providers.html
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security.html
index 18e338ca37..d313cad645 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Security.html
@@ -314,7 +314,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -322,7 +322,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Virtual-Host-Initial-Configuration.html b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Virtual-Host-Initial-Configuration.html
index 86276b994f..87a8da3e5a 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Virtual-Host-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/Java-Broker-Virtual-Host-Initial-Configuration.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/apds02.html b/content/releases/qpid-broker-j-8.0.6/book/apds02.html
index 483f72366e..4c04753f89 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/apds02.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/apds02.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/apds03.html b/content/releases/qpid-broker-j-8.0.6/book/apds03.html
index fb279bf7f6..03343c77b8 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/apds03.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/apds03.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/book/index.html b/content/releases/qpid-broker-j-8.0.6/book/index.html
index cf8048b4e9..e356533d0d 100644
--- a/content/releases/qpid-broker-j-8.0.6/book/index.html
+++ b/content/releases/qpid-broker-j-8.0.6/book/index.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/index.html b/content/releases/qpid-broker-j-8.0.6/index.html
index 7cc3d4ba1e..4b5e2c0e14 100644
--- a/content/releases/qpid-broker-j-8.0.6/index.html
+++ b/content/releases/qpid-broker-j-8.0.6/index.html
@@ -207,7 +207,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -215,7 +215,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-8.0.6/release-notes.html b/content/releases/qpid-broker-j-8.0.6/release-notes.html
index 7e17c7ea54..b9f81b1857 100644
--- a/content/releases/qpid-broker-j-8.0.6/release-notes.html
+++ b/content/releases/qpid-broker-j-8.0.6/release-notes.html
@@ -150,7 +150,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Apache-Qpid-Broker-J-Book.html b/content/releases/qpid-broker-j-9.0.0/book/Apache-Qpid-Broker-J-Book.html
index 29201b79ba..6ed72c1fba 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Apache-Qpid-Broker-J-Book.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Apache-Qpid-Broker-J-Book.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
index 05b2e330d1..4010d682d6 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
index 861a9c2237..4af61ddd3d 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
@@ -236,7 +236,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -244,7 +244,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Environment-Variables.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Environment-Variables.html
index ba603f0e09..2fb34ec14e 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Environment-Variables.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Environment-Variables.html
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Operation-Logging.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Operation-Logging.html
index a9c69db8ea..205aa8e52c 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Operation-Logging.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Operation-Logging.html
@@ -553,7 +553,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -561,7 +561,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Queue-Alerts.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Queue-Alerts.html
index be35abb95b..99bb48e8b0 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Queue-Alerts.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Queue-Alerts.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
index ab17402d61..3bd4403f98 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
@@ -214,7 +214,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -222,7 +222,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Statistics-Reporting.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Statistics-Reporting.html
index 026478303a..39037b3f12 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Statistics-Reporting.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-Statistics-Reporting.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-System-Properties.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-System-Properties.html
index fa8d816e5f..ee9c2b9147 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-System-Properties.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Appendix-System-Properties.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
index 5e1d333cff..a6a05265fd 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
index 8763f0e284..999493d0cb 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery.html
index 6d6bceed1d..ca4431af4f 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Backup-And-Recovery.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Authentication-Providers.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Authentication-Providers.html
index b74aac08c0..d6dcd32b8e 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Authentication-Providers.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Broker.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Broker.html
index bf43e1596a..5484857f85 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Broker.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Broker.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Exchanges.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Exchanges.html
index 94b8e4cbcc..f7c9c6d3b8 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Exchanges.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Exchanges.html
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -194,7 +194,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Other-Services.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Other-Services.html
index c8e1a21366..e3ebcd2dcd 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Other-Services.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Other-Services.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Ports.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Ports.html
index e40184ac27..3503723c66 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Ports.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Ports.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Queues.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Queues.html
index f247141dba..d6dfe11f47 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Queues.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Queues.html
@@ -303,7 +303,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -311,7 +311,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
index 1ca0894d41..c433f0ff95 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
index 6be5186a8e..8c2a075f65 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Virtualhosts.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Virtualhosts.html
index a55ff0e9e5..e8dd9ec1bc 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts-Virtualhosts.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts.html
index 5b7d770787..55928f5161 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Concepts.html
@@ -159,7 +159,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-CommandLine.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-CommandLine.html
index 7c019875da..4a25e5f002 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-CommandLine.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-CommandLine.html
@@ -182,7 +182,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Logging.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Logging.html
index ff7cca9c97..b621626ed7 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Logging.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Logging.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
index 6c0eb790e7..2345e122ef 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
index 24ef4c76f0..45a19b9819 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started.html
index 61aeaa48d3..e7047552dd 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Getting-Started.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Backup.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Backup.html
index 80b5a69e95..955a30dc58 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Backup.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Backup.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Behaviour.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Behaviour.html
index 453a802f48..a9298cdbf2 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Behaviour.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Behaviour.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-ClientFailover.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-ClientFailover.html
index 326e38bcb5..2e91f3ad0d 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-ClientFailover.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-ClientFailover.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-CreatingGroup.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-CreatingGroup.html
index 7297fd3b23..ebf37b9dc8 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-CreatingGroup.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-CreatingGroup.html
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-DiskSpace.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-DiskSpace.html
index fa539af112..53f23a924d 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-DiskSpace.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-DiskSpace.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Network-Requirements.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Network-Requirements.html
index bcbc9883fe..8cf8a249b4 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Network-Requirements.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Network-Requirements.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-NodeOperations.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-NodeOperations.html
index ec1a3c1602..8f4133a270 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-NodeOperations.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-NodeOperations.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-OverviewOfHA.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-OverviewOfHA.html
index 2cb1fb37c6..e8b77815ca 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-OverviewOfHA.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
index dbb2d3879c..a0b1640ac1 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Security.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Security.html
index d60832ee2f..4009dcbde2 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Security.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability-Security.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability.html
index 7796de4929..6e85e10b2e 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-High-Availability.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
index 3bf1dba513..b7f7a243a2 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
index 67d101bed4..be5d61d45c 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Example.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Example.html
index 15c4b4ad2d..d2f8b19834 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Example.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Example.html
@@ -224,7 +224,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -232,7 +232,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
index 3da72e434e..d26d629fef 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Location.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Location.html
index 5060952ceb..32396a2bc3 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Location.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Location.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Type.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Type.html
index 77fd194bee..23c95ec89b 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Type.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration-Type.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration.html
index 4c204801eb..0331a9b51f 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Initial-Configuration.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-Download.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-Download.html
index 85ec30d4c1..8c45a46a2c 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-Download.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-Download.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-InstallationUnix.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-InstallationUnix.html
index dd606591f4..0d3870635f 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-InstallationUnix.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-InstallationUnix.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-InstallationWindows.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-InstallationWindows.html
index 4c2ede84b0..4da77568cf 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-InstallationWindows.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-InstallationWindows.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-OptionalDependencies.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-OptionalDependencies.html
index 81fa1bdc71..29ecd58b34 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-OptionalDependencies.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-OptionalDependencies.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-Prerequistes.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-Prerequistes.html
index bfa29f043e..fdec9ae9d9 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-Prerequistes.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation-Prerequistes.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation.html
index d7b5ff2a0e..187ded73f0 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Installation.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Introduction.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Introduction.html
index 3ebd3ccd3d..cb16726ef9 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Introduction.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
index 807fad6776..d667e30def 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-REST-API.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-REST-API.html
index cb87b73035..ed2342fe1b 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-REST-API.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-REST-API.html
@@ -1935,7 +1935,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1943,7 +1943,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-Web-Console.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-Web-Console.html
index 64fcde3079..ba3cfab924 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-Web-Console.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel-Web-Console.html
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel.html
index 79b36d2084..58c4a7d9d3 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Channel.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
index d243f6210c..b76b5dec61 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Authentication-Providers.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
index 6e8f0288fa..709249eef2 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Broker.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Broker.html
index 5558f2ace1..99953e2ae0 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Broker.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Broker.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
index f6953b408d..f5167df858 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Consumers.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Consumers.html
index e5d1160884..21bd799ac7 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Consumers.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Consumers.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Entities.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Entities.html
index c93f50631d..14420200bd 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Entities.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Entities.html
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Exchanges.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Exchanges.html
index 177bbf3d7c..6ea2878d64 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Exchanges.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Exchanges.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Group-Providers.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Group-Providers.html
index f8d3d6162d..7d77a5ca80 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Group-Providers.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Group-Providers.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Keystores.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Keystores.html
index a077df4ad4..0b58f477c8 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Keystores.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Keystores.html
@@ -170,7 +170,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index dc0f73a166..61438f5be0 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Ports.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Ports.html
index 1a3f88cecd..9e5412ca5b 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Ports.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Ports.html
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Producers.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Producers.html
index 36cca6e276..db39156615 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Producers.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Producers.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Queues.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Queues.html
index 6fadaa3f0b..69dfd266d9 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Queues.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Queues.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index cf7e833ba1..87e3fdee77 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Truststores.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Truststores.html
index 838442cd7f..1c3626a0d0 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Truststores.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Truststores.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index 2476610f37..13984f10b5 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Virtualhosts.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Virtualhosts.html
index b91e0774b5..452739ebc1 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Managing-Virtualhosts.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Metrics.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Metrics.html
index b04e49203d..4b1e659e0e 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Metrics.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Management-Metrics.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index 1e8fad652f..c8d34a7af2 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Miscellaneous.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Miscellaneous.html
index 89aee098f3..57e43e83f2 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Miscellaneous.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Miscellaneous.html
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Background-Recovery.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Background-Recovery.html
index 0f859cdd7e..30a0ff7ca8 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Background-Recovery.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Background-Recovery.html
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index 4df47cdc95..3ae05288f9 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Connection-Limit.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Connection-Limit.html
index f2f16cc309..b98df829f8 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Connection-Limit.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Connection-Limit.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Consumers.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Consumers.html
index 12968ef044..ff410e4ac7 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Consumers.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Consumers.html
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Disk-Space-Management.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Disk-Space-Management.html
index 6df2bbd2c6..2b24570578 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Disk-Space-Management.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Flow-To-Disk.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Flow-To-Disk.html
index 05e7d75167..6fe4570381 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Flow-To-Disk.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index 992f223ab7..05c74b0bed 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
@@ -176,7 +176,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Instrumentation.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Instrumentation.html
index 5ce4e22414..57600c78a6 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Instrumentation.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Instrumentation.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Memory.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Memory.html
index cac40b3fee..47d35c37c8 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Memory.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Memory.html
@@ -262,7 +262,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -270,7 +270,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Message-Compression.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Message-Compression.html
index f4d4df1d2c..eeb08cb936 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Message-Compression.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Message-Compression.html
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Transaction-Timeout.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Transaction-Timeout.html
index 7f3f165e32..fb604fcbf9 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Transaction-Timeout.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime-Transaction-Timeout.html
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime.html
index cc5bac585d..818af64036 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Runtime.html
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -239,7 +239,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-AccessControlProviders.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-AccessControlProviders.html
index 7814464e02..0524f152cc 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-AccessControlProviders.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-AccessControlProviders.html
@@ -353,7 +353,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -361,7 +361,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-Configuration-Encryption.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-Configuration-Encryption.html
index ff31128c12..edcb4106f3 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-Configuration-Encryption.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-Configuration-Encryption.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-ConnectionLimitProviders.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-ConnectionLimitProviders.html
index 0796ec7017..5654bcd14a 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-ConnectionLimitProviders.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-ConnectionLimitProviders.html
@@ -265,7 +265,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -273,7 +273,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-Group-Providers.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-Group-Providers.html
index 7f49adb1aa..bb482c515c 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-Group-Providers.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security-Group-Providers.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security.html
index 3563801ecb..dbd280336c 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Security.html
@@ -327,7 +327,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -335,7 +335,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
index bdd718156f..564a196b57 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/apds02.html b/content/releases/qpid-broker-j-9.0.0/book/apds02.html
index 191105a0c9..ef71b1d04f 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/apds02.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/apds02.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/apds03.html b/content/releases/qpid-broker-j-9.0.0/book/apds03.html
index cff6ef7f17..b56388821b 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/apds03.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/apds03.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/book/index.html b/content/releases/qpid-broker-j-9.0.0/book/index.html
index b64c35de06..8be024995a 100644
--- a/content/releases/qpid-broker-j-9.0.0/book/index.html
+++ b/content/releases/qpid-broker-j-9.0.0/book/index.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/index.html b/content/releases/qpid-broker-j-9.0.0/index.html
index c8058a5359..0ea2388d1e 100644
--- a/content/releases/qpid-broker-j-9.0.0/index.html
+++ b/content/releases/qpid-broker-j-9.0.0/index.html
@@ -207,7 +207,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -215,7 +215,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.0.0/release-notes.html b/content/releases/qpid-broker-j-9.0.0/release-notes.html
index 08da2d2ebe..bc96e6d5ed 100644
--- a/content/releases/qpid-broker-j-9.0.0/release-notes.html
+++ b/content/releases/qpid-broker-j-9.0.0/release-notes.html
@@ -170,7 +170,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Apache-Qpid-Broker-J-Book.html b/content/releases/qpid-broker-j-9.1.0/book/Apache-Qpid-Broker-J-Book.html
index 023e80aac1..12ff0ba14f 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Apache-Qpid-Broker-J-Book.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Apache-Qpid-Broker-J-Book.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
index 0ae7052a71..204da14934 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
index 42bcd627d7..4817bf1af1 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
@@ -236,7 +236,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -244,7 +244,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Environment-Variables.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Environment-Variables.html
index 18895f57e8..8466160c09 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Environment-Variables.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Environment-Variables.html
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Operation-Logging.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Operation-Logging.html
index 6cdb3021fd..fd9d9437d4 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Operation-Logging.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Operation-Logging.html
@@ -553,7 +553,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -561,7 +561,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Queue-Alerts.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Queue-Alerts.html
index ee98febd1c..a04e30d016 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Queue-Alerts.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Queue-Alerts.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
index 0378931852..11d9ce4bd5 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
@@ -214,7 +214,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -222,7 +222,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Statistics-Reporting.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Statistics-Reporting.html
index 5eb4e01894..3a651c198d 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Statistics-Reporting.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-Statistics-Reporting.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-System-Properties.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-System-Properties.html
index 3eca87c380..085f38d01e 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-System-Properties.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Appendix-System-Properties.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
index 19958e97e3..785d075717 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
index 1ce4adf43a..c58599b048 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery.html
index 83578f14c1..cb7d92ceec 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Backup-And-Recovery.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Authentication-Providers.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Authentication-Providers.html
index 197067d011..ac06122bc2 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Authentication-Providers.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Broker.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Broker.html
index b65ead6e41..bf3d5623e0 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Broker.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Broker.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Exchanges.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Exchanges.html
index db44f9e4d3..7fd90942d6 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Exchanges.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Exchanges.html
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -194,7 +194,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Other-Services.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Other-Services.html
index 9d6d82e0d0..3669768660 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Other-Services.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Other-Services.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Ports.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Ports.html
index 9103706ab4..74ffdca98a 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Ports.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Ports.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Queues.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Queues.html
index 3692b352f0..e7b8f83720 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Queues.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Queues.html
@@ -303,7 +303,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -311,7 +311,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
index f3e19a97b5..f64e544b32 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
index 24b71647f7..7dbbfca1c9 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Virtualhosts.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Virtualhosts.html
index 168bb286b8..866a08d0d0 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts-Virtualhosts.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts.html
index 77e3a1403f..3bacd20b7a 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Concepts.html
@@ -159,7 +159,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-CommandLine.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-CommandLine.html
index e285491968..9e771d7785 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-CommandLine.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-CommandLine.html
@@ -182,7 +182,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Logging.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Logging.html
index 4b0e5d4074..7f328ba7e4 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Logging.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Logging.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
index 4060fee8b8..45f070cb91 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
index 6380e82e09..fa7f2cbaf5 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started.html
index aadd38bc90..f10a131762 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Getting-Started.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Backup.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Backup.html
index 595928497e..d7cfdc57c6 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Backup.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Backup.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Behaviour.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Behaviour.html
index 289227c47c..8c3ccc8dd7 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Behaviour.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Behaviour.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-ClientFailover.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-ClientFailover.html
index 083ed2c285..89ece6b047 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-ClientFailover.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-ClientFailover.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-CreatingGroup.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-CreatingGroup.html
index f4ee2715b0..e47801066e 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-CreatingGroup.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-CreatingGroup.html
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-DiskSpace.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-DiskSpace.html
index 393a71190f..96a35f94d0 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-DiskSpace.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-DiskSpace.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Network-Requirements.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Network-Requirements.html
index 9c234bf941..900b764e8e 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Network-Requirements.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Network-Requirements.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-NodeOperations.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-NodeOperations.html
index 68ae28f153..f2cc2ca3d3 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-NodeOperations.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-NodeOperations.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-OverviewOfHA.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-OverviewOfHA.html
index 7e012697a5..502708311b 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-OverviewOfHA.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
index 18acae8e98..9f0fcffe46 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Security.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Security.html
index 3a38b23ad7..9ed35fff79 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Security.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability-Security.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability.html
index 063f8d3bb1..945346ba1a 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-High-Availability.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
index 143eab7a61..b204c50680 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
index 2065024289..b14f051f5c 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Example.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Example.html
index d26b7360b3..3f2f3a656e 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Example.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Example.html
@@ -224,7 +224,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -232,7 +232,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
index 20419c6c79..bd6ef3dd29 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Location.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Location.html
index 467361638a..d04e5f5b16 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Location.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Location.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Type.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Type.html
index 7a413ebd38..6691096178 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Type.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration-Type.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration.html
index 103ff249b2..f33f2b924b 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Initial-Configuration.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-Download.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-Download.html
index f4b5373eef..10e0384481 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-Download.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-Download.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-InstallationUnix.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-InstallationUnix.html
index 452a61b402..05513c30c7 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-InstallationUnix.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-InstallationUnix.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-InstallationWindows.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-InstallationWindows.html
index 527c9ba2ad..3e4fd17eb8 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-InstallationWindows.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-InstallationWindows.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-OptionalDependencies.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-OptionalDependencies.html
index 2dffe2e8a0..9f432e3440 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-OptionalDependencies.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-OptionalDependencies.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-Prerequistes.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-Prerequistes.html
index 71303554e2..f6789b289a 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-Prerequistes.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation-Prerequistes.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation.html
index 034267fded..d1da99442d 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Installation.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Introduction.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Introduction.html
index 9baadd6288..42303fd85f 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Introduction.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
index 8254386104..e1256d23c1 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-REST-API.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-REST-API.html
index 0f915e1e75..d73740a71a 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-REST-API.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-REST-API.html
@@ -1935,7 +1935,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1943,7 +1943,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-Web-Console.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-Web-Console.html
index ac46a4ba55..949c240194 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-Web-Console.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel-Web-Console.html
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel.html
index 6457fcf97b..960688d8eb 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Channel.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
index 0ec27ad044..9638dfab86 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Authentication-Providers.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
index 0f408548df..ce2c4c34c8 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Broker.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Broker.html
index 500a04426a..fb734f642f 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Broker.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Broker.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
index 26ce2c182e..bf1f3d6ed1 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Consumers.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Consumers.html
index 2a4b76d116..569e33234f 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Consumers.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Consumers.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Entities.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Entities.html
index 9f43be1675..0d1a4a645b 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Entities.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Entities.html
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Exchanges.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Exchanges.html
index a4ad1033d6..297926064f 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Exchanges.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Exchanges.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Group-Providers.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Group-Providers.html
index 9fce652c0c..8a1a53eab2 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Group-Providers.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Group-Providers.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Keystores.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Keystores.html
index 593f0dc937..c707271f5b 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Keystores.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Keystores.html
@@ -170,7 +170,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index 0530b8f129..ad99df9fa4 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Ports.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Ports.html
index 9f9fe38870..e049a6ab5c 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Ports.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Ports.html
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Producers.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Producers.html
index 3754ee9597..174fdb0a70 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Producers.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Producers.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Queues.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Queues.html
index a037805a79..52277fc23e 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Queues.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Queues.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index 8c7ccb332e..0937cf788c 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Truststores.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Truststores.html
index c4a9851fa5..77b5ceb18d 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Truststores.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Truststores.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index 6bf992583a..7ae595b37f 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Virtualhosts.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Virtualhosts.html
index 020689e605..6e3db07074 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Managing-Virtualhosts.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Metrics.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Metrics.html
index 445f7f2fc4..5bcd48d802 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Metrics.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Management-Metrics.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index c08de84d65..b72906bb4c 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Miscellaneous.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Miscellaneous.html
index 2846b3732d..04ece1f199 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Miscellaneous.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Miscellaneous.html
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Background-Recovery.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Background-Recovery.html
index 83874af91a..b4ce2455e4 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Background-Recovery.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Background-Recovery.html
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index fb370edf26..c022490981 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Connection-Limit.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Connection-Limit.html
index 7d90583bae..9a2e403fd4 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Connection-Limit.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Connection-Limit.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Consumers.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Consumers.html
index 0f1fd53577..e249faaa98 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Consumers.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Consumers.html
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Disk-Space-Management.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Disk-Space-Management.html
index f9fa92fa62..0eae8ccc0d 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Disk-Space-Management.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Flow-To-Disk.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Flow-To-Disk.html
index 4179456d0c..cb9e6085b6 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Flow-To-Disk.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index 399a6cd342..1ed9be004b 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
@@ -176,7 +176,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Instrumentation.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Instrumentation.html
index 5377767e92..57c4a0e5e1 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Instrumentation.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Instrumentation.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Memory.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Memory.html
index e69a0923b7..4bf66ba5ac 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Memory.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Memory.html
@@ -260,7 +260,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -268,7 +268,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Message-Compression.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Message-Compression.html
index e0b98e15bd..3785554864 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Message-Compression.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Message-Compression.html
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Transaction-Timeout.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Transaction-Timeout.html
index 2009cc1dbb..8dd82f8392 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Transaction-Timeout.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime-Transaction-Timeout.html
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime.html
index d1775496da..78fef9b23a 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Runtime.html
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -239,7 +239,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-AccessControlProviders.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-AccessControlProviders.html
index bdbc9fd9ba..b594aaecd5 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-AccessControlProviders.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-AccessControlProviders.html
@@ -353,7 +353,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -361,7 +361,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-Configuration-Encryption.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-Configuration-Encryption.html
index 90bc7cdef8..1aa080bfd9 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-Configuration-Encryption.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-Configuration-Encryption.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-ConnectionLimitProviders.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-ConnectionLimitProviders.html
index 59a46ffefd..30de24d31b 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-ConnectionLimitProviders.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-ConnectionLimitProviders.html
@@ -265,7 +265,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -273,7 +273,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-Group-Providers.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-Group-Providers.html
index e3d0458511..e41ef53027 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-Group-Providers.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security-Group-Providers.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security.html
index 3af4114dc7..6b616d30fb 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Security.html
@@ -329,7 +329,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -337,7 +337,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
index 937bf5b545..c089d49413 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/apds02.html b/content/releases/qpid-broker-j-9.1.0/book/apds02.html
index 560894a08d..cd9d368154 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/apds02.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/apds02.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/apds03.html b/content/releases/qpid-broker-j-9.1.0/book/apds03.html
index d2c6a20079..53876acd08 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/apds03.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/apds03.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/book/index.html b/content/releases/qpid-broker-j-9.1.0/book/index.html
index 3430b101d7..d79ba148d8 100644
--- a/content/releases/qpid-broker-j-9.1.0/book/index.html
+++ b/content/releases/qpid-broker-j-9.1.0/book/index.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/index.html b/content/releases/qpid-broker-j-9.1.0/index.html
index 93aed78986..65bfecb567 100644
--- a/content/releases/qpid-broker-j-9.1.0/index.html
+++ b/content/releases/qpid-broker-j-9.1.0/index.html
@@ -207,7 +207,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -215,7 +215,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.1.0/release-notes.html b/content/releases/qpid-broker-j-9.1.0/release-notes.html
index 1458929df2..9c7c76eba2 100644
--- a/content/releases/qpid-broker-j-9.1.0/release-notes.html
+++ b/content/releases/qpid-broker-j-9.1.0/release-notes.html
@@ -166,7 +166,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Apache-Qpid-Broker-J-Book.html b/content/releases/qpid-broker-j-9.2.0/book/Apache-Qpid-Broker-J-Book.html
index 206f92c815..25362ab995 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Apache-Qpid-Broker-J-Book.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Apache-Qpid-Broker-J-Book.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
index aa365b134c..b400f0efd8 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
index 1134628ace..21d4f37761 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
@@ -236,7 +236,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -244,7 +244,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Environment-Variables.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Environment-Variables.html
index 1f7948076f..7a0a41834f 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Environment-Variables.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Environment-Variables.html
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Operation-Logging.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Operation-Logging.html
index 65d63936da..6f1eac0e73 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Operation-Logging.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Operation-Logging.html
@@ -553,7 +553,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -561,7 +561,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Queue-Alerts.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Queue-Alerts.html
index a30d005397..140155df6d 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Queue-Alerts.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Queue-Alerts.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
index b6f97b36d5..d30ae640cd 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
@@ -214,7 +214,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -222,7 +222,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Statistics-Reporting.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Statistics-Reporting.html
index 3191932c5c..0698a08b82 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Statistics-Reporting.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-Statistics-Reporting.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-System-Properties.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-System-Properties.html
index 75752d2df3..41ebca4030 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-System-Properties.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Appendix-System-Properties.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
index 2f068bc4e5..a45589ac1b 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
index a25b0c91f1..d8ad993bf1 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery.html
index 72141273c2..44705a5876 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Backup-And-Recovery.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Authentication-Providers.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Authentication-Providers.html
index ecaf26cedd..0ba81b0df4 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Authentication-Providers.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Broker.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Broker.html
index 7c62bde17c..636353f7b3 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Broker.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Broker.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Exchanges.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Exchanges.html
index dcf8ce5662..a9075bfee5 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Exchanges.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Exchanges.html
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -194,7 +194,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Other-Services.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Other-Services.html
index dcf9068080..afa426a345 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Other-Services.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Other-Services.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Ports.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Ports.html
index e6791e0725..2cc1f3d239 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Ports.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Ports.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Queues.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Queues.html
index dabaac2309..a08341e698 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Queues.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Queues.html
@@ -303,7 +303,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -311,7 +311,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
index 633f0e5ff5..5027fcc486 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-RemoteReplicationNodes.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
index cca1eac6a7..965f0fb29a 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Virtualhost-Nodes.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Virtualhosts.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Virtualhosts.html
index d5f6a0c25c..f126edecec 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts-Virtualhosts.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts.html
index 5feefc7f4a..8f765905f0 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Concepts.html
@@ -159,7 +159,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Broker-Customization.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Broker-Customization.html
index 496d0eaf7b..3af46e681a 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Broker-Customization.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Broker-Customization.html
@@ -259,7 +259,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -267,7 +267,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Broker-Users.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Broker-Users.html
index 84940cda07..b3bca9d676 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Broker-Users.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Broker-Users.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Running-The-Container.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Running-The-Container.html
index 21f6d76e75..5a9f808ffc 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Running-The-Container.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker-Running-The-Container.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker.html
index 1366733ef0..0c4ca343d3 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Docker.html
@@ -163,7 +163,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -171,7 +171,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-CommandLine.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-CommandLine.html
index f1061749b9..8563c38d3a 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-CommandLine.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-CommandLine.html
@@ -182,7 +182,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Logging.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Logging.html
index cd0cabfca3..1c0659cf4c 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Logging.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Logging.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
index 5d33f97bb7..16da62878f 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
index f432d1d1ed..1e9101508e 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started.html
index 84b48af072..5724575417 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Getting-Started.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Backup.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Backup.html
index 3450657304..40e147fbfb 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Backup.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Backup.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Behaviour.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Behaviour.html
index 5420348674..325a8b8179 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Behaviour.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Behaviour.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-ClientFailover.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-ClientFailover.html
index 4ba7368329..9837fc9b83 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-ClientFailover.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-ClientFailover.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-CreatingGroup.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-CreatingGroup.html
index 97dd023109..3ae42511e3 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-CreatingGroup.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-CreatingGroup.html
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-DiskSpace.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-DiskSpace.html
index f1f2d08ca2..a5f963ecb9 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-DiskSpace.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-DiskSpace.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Network-Requirements.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Network-Requirements.html
index dae0f288c3..a747d7d64c 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Network-Requirements.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Network-Requirements.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-NodeOperations.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-NodeOperations.html
index 1e9c688bf9..dc8cd91baa 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-NodeOperations.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-NodeOperations.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-OverviewOfHA.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-OverviewOfHA.html
index b753a35276..8fdde60c8e 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-OverviewOfHA.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
index 3b322e3563..9e71a7c789 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Security.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Security.html
index 4ec96a81f7..210f83b275 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Security.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability-Security.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability.html
index 0a4ebad275..047934ef7c 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-High-Availability.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
index 8fe0fad185..5f7332eb21 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
index 934de0511f..2e1eec2f7a 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Example.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Example.html
index 33106c275c..25548be37a 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Example.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Example.html
@@ -224,7 +224,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -232,7 +232,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
index 5e58d08c91..84e260658e 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Location.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Location.html
index 28a4abae7e..949b8c7e75 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Location.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Location.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Type.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Type.html
index 3fbf0b1261..5aa53849d2 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Type.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration-Type.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration.html
index a63e8b147a..e608f0981d 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Initial-Configuration.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-Download.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-Download.html
index d821b89fbd..da2fccd9fc 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-Download.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-Download.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-InstallationUnix.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-InstallationUnix.html
index 6789bd2038..21a2a44779 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-InstallationUnix.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-InstallationUnix.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-InstallationWindows.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-InstallationWindows.html
index 7b3b2f9b35..6ebb6fc31c 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-InstallationWindows.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-InstallationWindows.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-OptionalDependencies.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-OptionalDependencies.html
index aa53195c6b..301bfd2d75 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-OptionalDependencies.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-OptionalDependencies.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-Prerequistes.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-Prerequistes.html
index dcf01ab2e7..180fe0134b 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-Prerequistes.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation-Prerequistes.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation.html
index 0dd8c00bb5..c962e1ff83 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Installation.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Introduction.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Introduction.html
index c9a4df3f3e..68c0a5e180 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Introduction.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
index c9657d96b4..7151e603f7 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-REST-API.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-REST-API.html
index 2bcb08bcd6..5b415d7718 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-REST-API.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-REST-API.html
@@ -1935,7 +1935,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1943,7 +1943,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-Web-Console.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-Web-Console.html
index ee699d9843..4a018226cc 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-Web-Console.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel-Web-Console.html
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel.html
index 8ba6023df9..4d426116f8 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Channel.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
index 67083d0493..e65b913c33 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Access-Control-Providers.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Authentication-Providers.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
index 117aac7e7b..d0bec0e144 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Authentication-Providers.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Broker.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Broker.html
index c615875f9a..2b1031e6b5 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Broker.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Broker.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
index 8e87e6f11e..9db02aae61 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Consumers.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Consumers.html
index dbd52bb03c..d83bbc146c 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Consumers.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Consumers.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Entities.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Entities.html
index 17e192399f..63bf150ef6 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Entities.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Entities.html
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Exchanges.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Exchanges.html
index a5bcb5d411..4d8bd4faae 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Exchanges.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Exchanges.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Group-Providers.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Group-Providers.html
index c5554a33e3..dc4280c3fd 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Group-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Group-Providers.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Keystores.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Keystores.html
index dc0b0b01d0..0c6e65d4ef 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Keystores.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Keystores.html
@@ -170,7 +170,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index b60dbd3039..1c15d0dfb3 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Plugin-HTTP.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Ports.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Ports.html
index 577adb327a..d212e7317c 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Ports.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Ports.html
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Producers.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Producers.html
index 72583148e4..f34f625080 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Producers.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Producers.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Queues.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Queues.html
index 4203007044..51452167b8 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Queues.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Queues.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index 88499cdb0e..c28e2c2ce6 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Truststores.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Truststores.html
index 828e7f3743..ae62a52a8b 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Truststores.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Truststores.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index 5abeb4022d..23ed92ad18 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Virtualhosts.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Virtualhosts.html
index fe2beddd6b..bfc1e046cf 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Managing-Virtualhosts.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Metrics.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Metrics.html
index e32eb9bcb5..b20a428de5 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Metrics.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Management-Metrics.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index 75abfb1f89..0ecb19b5e5 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Miscellaneous.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Miscellaneous.html
index 410e16cc88..51c65becb7 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Miscellaneous.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Miscellaneous.html
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Background-Recovery.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Background-Recovery.html
index 8b7da09f90..5d7aeb001d 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Background-Recovery.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Background-Recovery.html
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index bce2dabf16..2f4806cfa2 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Connection-Limit.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Connection-Limit.html
index e545e80dd4..2e5bedcf82 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Connection-Limit.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Connection-Limit.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Consumers.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Consumers.html
index ca54329ed8..c34feae17e 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Consumers.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Consumers.html
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Disk-Space-Management.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Disk-Space-Management.html
index 9f197e72ca..2196262008 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Disk-Space-Management.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Flow-To-Disk.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Flow-To-Disk.html
index 2d9bd76b9b..034c91cfac 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Flow-To-Disk.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index d7fe3ae24b..4afb3bdae0 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
@@ -176,7 +176,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Instrumentation.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Instrumentation.html
index ae1fb46f4c..cd0c30470a 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Instrumentation.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Instrumentation.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Memory.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Memory.html
index 6daee4309c..84e80ce946 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Memory.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Memory.html
@@ -260,7 +260,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -268,7 +268,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Message-Compression.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Message-Compression.html
index 4e84580516..f8a77a785a 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Message-Compression.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Message-Compression.html
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Transaction-Timeout.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Transaction-Timeout.html
index f6632465cd..2ab09289e3 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Transaction-Timeout.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime-Transaction-Timeout.html
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime.html
index 04a317b9f6..fc1121e367 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Runtime.html
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -239,7 +239,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-AccessControlProviders.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-AccessControlProviders.html
index 89592ab764..26c07e48a8 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-AccessControlProviders.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-AccessControlProviders.html
@@ -353,7 +353,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -361,7 +361,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-Configuration-Encryption.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-Configuration-Encryption.html
index 232f37b8bf..5944c1ff8a 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-Configuration-Encryption.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-Configuration-Encryption.html
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-ConnectionLimitProviders.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-ConnectionLimitProviders.html
index bb0f97ba02..9990a47b86 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-ConnectionLimitProviders.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-ConnectionLimitProviders.html
@@ -265,7 +265,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -273,7 +273,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-Group-Providers.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-Group-Providers.html
index 153d7d1d78..4035ed6fa4 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-Group-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security-Group-Providers.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security.html
index 65f21094c7..141a494d59 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Security.html
@@ -329,7 +329,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -337,7 +337,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
index 44f0c09c57..d285032e67 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/Java-Broker-Virtual-Host-Initial-Configuration.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/apds02.html b/content/releases/qpid-broker-j-9.2.0/book/apds02.html
index 7c61fdff10..05966079c2 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/apds02.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/apds02.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/apds03.html b/content/releases/qpid-broker-j-9.2.0/book/apds03.html
index 034c8b4cce..e9b6f4b649 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/apds03.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/apds03.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/book/index.html b/content/releases/qpid-broker-j-9.2.0/book/index.html
index 67fbbcaf4d..5b9914f535 100644
--- a/content/releases/qpid-broker-j-9.2.0/book/index.html
+++ b/content/releases/qpid-broker-j-9.2.0/book/index.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/index.html b/content/releases/qpid-broker-j-9.2.0/index.html
index a08a3b9775..63d9f1d8e7 100644
--- a/content/releases/qpid-broker-j-9.2.0/index.html
+++ b/content/releases/qpid-broker-j-9.2.0/index.html
@@ -207,7 +207,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -215,7 +215,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.0/release-notes.html b/content/releases/qpid-broker-j-9.2.0/release-notes.html
index 1eea2e9efe..517e32ad09 100644
--- a/content/releases/qpid-broker-j-9.2.0/release-notes.html
+++ b/content/releases/qpid-broker-j-9.2.0/release-notes.html
@@ -155,7 +155,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -163,7 +163,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Apache-Qpid-Broker-J-Book.html b/content/releases/qpid-broker-j-9.2.1/book/Apache-Qpid-Broker-J-Book.html
index 292a1c6741..0393465d52 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Apache-Qpid-Broker-J-Book.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Apache-Qpid-Broker-J-Book.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
index 1a5b54a1b7..2606216bae 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration-creation.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
index 8b365b9fa6..a9cdfb8a47 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-BDB-HA-initial-configuration.html
@@ -236,7 +236,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -244,7 +244,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Environment-Variables.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Environment-Variables.html
index a41164dc07..51a3f02729 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Environment-Variables.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Environment-Variables.html
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Operation-Logging.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Operation-Logging.html
index 74f979dde4..28e6a08d55 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Operation-Logging.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Operation-Logging.html
@@ -553,7 +553,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -561,7 +561,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Queue-Alerts.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Queue-Alerts.html
index 6cb4970418..ba965b3b5d 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Queue-Alerts.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Queue-Alerts.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Queue-Declare-Arguments.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
index 1255878244..d53d203d5f 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Queue-Declare-Arguments.html
@@ -214,7 +214,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -222,7 +222,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Statistics-Reporting.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Statistics-Reporting.html
index 77626ba4aa..2c8f52741f 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Statistics-Reporting.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-Statistics-Reporting.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-System-Properties.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-System-Properties.html
index 0edaf6b739..a63e462dcc 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-System-Properties.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Appendix-System-Properties.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
index 20dde0fd5b..a9436ca8be 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery-Virtualhost.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
index 9003549ed3..26a00bd2e3 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery.html
index 9d2ca46905..d885dd495f 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Backup-And-Recovery.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Authentication-Providers.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Authentication-Providers.html
index 4195e43fed..18fbc80c2e 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Authentication-Providers.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Broker.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Broker.html
index c61de2f771..41ca27c786 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Broker.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Broker.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Exchanges.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Exchanges.html
index 20041a4cad..eeaafac581 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Exchanges.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Exchanges.html
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -194,7 +194,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Other-Services.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Other-Services.html
index 86e9509b60..929bc67612 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Other-Services.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Other-Services.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Ports.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Ports.html
index 8b0d00af83..9fd52ca7f7 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Ports.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Ports.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Queues.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Queues.html
index c2c67d592c..93005fdeb3 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Queues.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Queues.html
@@ -303,7 +303,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -311,7 +311,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-RemoteReplicationNodes.html
index 7d33bdad43..5f660757b4 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-RemoteReplicationNodes.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Virtualhost-Nodes.html
index f6be861a04..b636f8d6f2 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Virtualhost-Nodes.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Virtualhosts.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Virtualhosts.html
index 5e3ba18a0f..83391a7d9a 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts-Virtualhosts.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts.html
index 4d041736c2..be3679a8ad 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Concepts.html
@@ -159,7 +159,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Broker-Customization.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Broker-Customization.html
index c9160acfa8..d4f4b9d3c8 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Broker-Customization.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Broker-Customization.html
@@ -259,7 +259,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -267,7 +267,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Broker-Users.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Broker-Users.html
index 9d65a9912c..e3588b54a1 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Broker-Users.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Broker-Users.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Running-The-Container.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Running-The-Container.html
index f892f78c96..138ddc9bf4 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Running-The-Container.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker-Running-The-Container.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker.html
index f9b8d85241..ebb5560341 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Docker.html
@@ -163,7 +163,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -171,7 +171,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-CommandLine.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-CommandLine.html
index 1c8ef7c77d..80506b26bc 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-CommandLine.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-CommandLine.html
@@ -182,7 +182,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Logging.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Logging.html
index 374f9f3677..0429ff91b4 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Logging.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Logging.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
index e4eb74e51b..46aa4e7ace 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
index f91c1dea71..2304365194 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started.html
index f5a9006887..cbb25143f7 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Getting-Started.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Backup.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Backup.html
index 6ddcb15b78..cf29f565c6 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Backup.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Backup.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Behaviour.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Behaviour.html
index bf92e1b2ed..23a934dd74 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Behaviour.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Behaviour.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-ClientFailover.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-ClientFailover.html
index 27b39e04be..863355cb44 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-ClientFailover.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-ClientFailover.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-CreatingGroup.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-CreatingGroup.html
index 1de4c494af..996078f1cc 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-CreatingGroup.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-CreatingGroup.html
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-DiskSpace.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-DiskSpace.html
index 4f2d313494..bf8bb19734 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-DiskSpace.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-DiskSpace.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Network-Requirements.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Network-Requirements.html
index f62c34fb16..efdad3abad 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Network-Requirements.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Network-Requirements.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-NodeOperations.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-NodeOperations.html
index f5adc95440..ed96915588 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-NodeOperations.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-NodeOperations.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-OverviewOfHA.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-OverviewOfHA.html
index 97111ca61c..1711bf3eb4 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-OverviewOfHA.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Reset-Group-Infomational.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
index 00cc9b7df6..eff324b782 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Security.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Security.html
index b94e41a516..e0f1de6614 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Security.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability-Security.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability.html
index 95c61f2f42..6db43ae3b3 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-High-Availability.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Configuration-Properties.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
index 121392ee36..93a20e9db5 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
index e4bdf0bedf..50cbd9e6e9 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Example.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Example.html
index a0f71087e3..f5c1bf5d8d 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Example.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Example.html
@@ -224,7 +224,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -232,7 +232,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
index 1394fd1e03..63c3b8ab0a 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Location.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Location.html
index 00d7754d77..1ebad88f71 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Location.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Location.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Type.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Type.html
index 921c7c1f0f..c8513eaeb9 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Type.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration-Type.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration.html
index 9009e8d00d..01b409e408 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Initial-Configuration.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-Download.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-Download.html
index db915d3248..91fe3cf82a 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-Download.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-Download.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-InstallationUnix.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-InstallationUnix.html
index 77ba3b7831..96220674a1 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-InstallationUnix.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-InstallationUnix.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-InstallationWindows.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-InstallationWindows.html
index c6b3063a05..aa9f332ee9 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-InstallationWindows.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-InstallationWindows.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-OptionalDependencies.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-OptionalDependencies.html
index 86e27fed47..20d46e2feb 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-OptionalDependencies.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-OptionalDependencies.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-Prerequistes.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-Prerequistes.html
index c17d7e16da..7594fe97ea 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-Prerequistes.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation-Prerequistes.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation.html
index c4acbfd6c4..b26d7ebadc 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Installation.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Introduction.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Introduction.html
index 97d8a44d0e..f9b8262209 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Introduction.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
index 0300f43856..dd9af208ba 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-REST-API.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-REST-API.html
index 1fb783774f..9067acf95c 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-REST-API.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-REST-API.html
@@ -1935,7 +1935,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1943,7 +1943,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-Web-Console.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-Web-Console.html
index fee897f557..0c8df45298 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-Web-Console.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel-Web-Console.html
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel.html
index 79c1f791e4..4417c0e6bc 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Channel.html
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Access-Control-Providers.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Access-Control-Providers.html
index 1b67982727..5dc6436071 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Access-Control-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Access-Control-Providers.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Authentication-Providers.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Authentication-Providers.html
index cd54f80bca..09bfb6c4e9 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Authentication-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Authentication-Providers.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Broker.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Broker.html
index 606c1bcbb5..e746b9941d 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Broker.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Broker.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
index aa222e3438..ab997f3fc4 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Connection-Limit-Providers.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Consumers.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Consumers.html
index ef2fd0e474..9716babbf0 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Consumers.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Consumers.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Entities.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Entities.html
index 67282dda94..c504a17378 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Entities.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Entities.html
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Exchanges.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Exchanges.html
index 6d2a7ef75f..e74c93cc2e 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Exchanges.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Exchanges.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Group-Providers.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Group-Providers.html
index 2b71d393b3..466c9c28cd 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Group-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Group-Providers.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Keystores.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Keystores.html
index 9dbf62348d..0bb11e5a22 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Keystores.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Keystores.html
@@ -170,7 +170,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Plugin-HTTP.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index 1b5106acb6..0566b99f88 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Plugin-HTTP.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Ports.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Ports.html
index 1e2decc719..55baf217d5 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Ports.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Ports.html
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Producers.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Producers.html
index fbde6e7311..3438d299b4 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Producers.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Producers.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Queues.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Queues.html
index fbc5684832..47f508f058 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Queues.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Queues.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index 999c0db66a..b8d799dfc2 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Truststores.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Truststores.html
index 026ebeaac1..ffab8d2830 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Truststores.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Truststores.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index 11fdfe4ad1..a12f17e128 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Virtualhosts.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Virtualhosts.html
index de7633c997..4124a472e5 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Managing-Virtualhosts.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Metrics.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Metrics.html
index 4b4d9a8909..aa8048b52c 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Metrics.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Management-Metrics.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index 10495e132c..9dde5b5207 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Miscellaneous.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Miscellaneous.html
index 67baa7ec9d..d1d2148727 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Miscellaneous.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Miscellaneous.html
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Background-Recovery.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Background-Recovery.html
index 818c24f8ba..f1a62e593d 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Background-Recovery.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Background-Recovery.html
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index a852374093..dfc891de0c 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Connection-Limit.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Connection-Limit.html
index cb7d5b466a..6536614a67 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Connection-Limit.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Connection-Limit.html
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Consumers.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Consumers.html
index d62d3c6b44..9930c6e1ee 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Consumers.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Consumers.html
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Disk-Space-Management.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Disk-Space-Management.html
index 91e15f2ec1..84b6b30ca6 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Disk-Space-Management.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Flow-To-Disk.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Flow-To-Disk.html
index 5b172cd7ae..2336d7f83a 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Flow-To-Disk.html
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index 8d512caaaf..421ee29155 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
@@ -176,7 +176,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Instrumentation.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Instrumentation.html
index b0588f91a8..8cbcfbee7f 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Instrumentation.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Instrumentation.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Memory.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Memory.html
index 2f7b8cf43d..05dcfdb023 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Memory.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Memory.html
@@ -260,7 +260,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -268,7 +268,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Message-Compression.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Message-Compression.html
index 67b2744171..c9950829a6 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Message-Compression.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Message-Compression.html
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Transaction-Timeout.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Transaction-Timeout.html
index ff76c97e03..bd9078fcf9 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Transaction-Timeout.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime-Transaction-Timeout.html
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime.html
index 794dcb6f31..411974fd8d 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Runtime.html
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -239,7 +239,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-AccessControlProviders.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-AccessControlProviders.html
index 4e2780cee3..150f5a9f48 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-AccessControlProviders.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-AccessControlProviders.html
@@ -353,7 +353,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -361,7 +361,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-Configuration-Encryption.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-Configuration-Encryption.html
index 56b101a579..aafa5607e0 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-Configuration-Encryption.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-Configuration-Encryption.html
@@ -147,7 +147,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-ConnectionLimitProviders.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-ConnectionLimitProviders.html
index 7084c141c0..02a5aefa9c 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-ConnectionLimitProviders.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-ConnectionLimitProviders.html
@@ -265,7 +265,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -273,7 +273,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-Group-Providers.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-Group-Providers.html
index 1109b393c1..771c5474a2 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-Group-Providers.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security-Group-Providers.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security.html
index 932aa6b618..a6491f7972 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Security.html
@@ -329,7 +329,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -337,7 +337,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Virtual-Host-Initial-Configuration.html b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Virtual-Host-Initial-Configuration.html
index 263879a9c4..b9a350ae23 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Virtual-Host-Initial-Configuration.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/Java-Broker-Virtual-Host-Initial-Configuration.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/apds02.html b/content/releases/qpid-broker-j-9.2.1/book/apds02.html
index 0a2ca30d36..5253265443 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/apds02.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/apds02.html
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/apds03.html b/content/releases/qpid-broker-j-9.2.1/book/apds03.html
index 4b84af14c9..2bdafac988 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/apds03.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/apds03.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/book/index.html b/content/releases/qpid-broker-j-9.2.1/book/index.html
index 8b6308f649..765729644a 100644
--- a/content/releases/qpid-broker-j-9.2.1/book/index.html
+++ b/content/releases/qpid-broker-j-9.2.1/book/index.html
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/index.html b/content/releases/qpid-broker-j-9.2.1/index.html
index e3cd01cb24..eb4dc382bf 100644
--- a/content/releases/qpid-broker-j-9.2.1/index.html
+++ b/content/releases/qpid-broker-j-9.2.1/index.html
@@ -207,7 +207,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -215,7 +215,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-broker-j-9.2.1/release-notes.html b/content/releases/qpid-broker-j-9.2.1/release-notes.html
index b9a7b0eae5..f44b5090c4 100644
--- a/content/releases/qpid-broker-j-9.2.1/release-notes.html
+++ b/content/releases/qpid-broker-j-9.2.1/release-notes.html
@@ -155,7 +155,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -163,7 +163,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/AMQP-Compatibility.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/AMQP-Compatibility.html
index e1d1ebc821..c49a15c6e9 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/AMQP-Compatibility.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/AMQP-Compatibility.html
@@ -517,7 +517,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -525,7 +525,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
index 5df016ea31..a726250d10 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
@@ -356,7 +356,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -364,7 +364,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/Using-message-groups.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/Using-message-groups.html
index 38638d65e5..715ae8aef2 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/Using-message-groups.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/Using-message-groups.html
@@ -280,7 +280,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -288,7 +288,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01.html
index 7ab291d5f8..46018cfb37 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01.html
@@ -671,7 +671,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -679,7 +679,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s02.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s02.html
index ace9831b06..cdd48173f5 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s02.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s02.html
@@ -267,7 +267,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -275,7 +275,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s03.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s03.html
index ed70a47d08..ec6aa91e50 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s03.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s03.html
@@ -222,7 +222,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -230,7 +230,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s06.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s06.html
index 09cfff1968..db0ee707dc 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s06.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch01s06.html
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -239,7 +239,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch02s02.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch02s02.html
index 4e8b5c67f7..a609332d83 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch02s02.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch02s02.html
@@ -710,7 +710,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -718,7 +718,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch02s03.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch02s03.html
index 79bddec4ea..1d6049da23 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch02s03.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ch02s03.html
@@ -828,7 +828,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -836,7 +836,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
index 0d0738b3be..20370b78e7 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
@@ -472,7 +472,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -480,7 +480,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
index 505e0f0c7e..70aa40f91f 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
@@ -1355,7 +1355,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1363,7 +1363,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chapter-Managing-CPP-Broker.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
index 8630160baa..aa160f3654 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
@@ -583,7 +583,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -591,7 +591,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chapter-ha.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chapter-ha.html
index 9497131a94..e4062268d6 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chapter-ha.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/chapter-ha.html
@@ -911,7 +911,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -919,7 +919,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ha-queue-replication.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ha-queue-replication.html
index 5a4ed80acf..2d5b6d3141 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ha-queue-replication.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/ha-queue-replication.html
@@ -202,7 +202,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -210,7 +210,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/index.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/index.html
index 9876ea7f48..01f9cb6eab 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/index.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/index.html
@@ -232,7 +232,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -240,7 +240,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/pr01.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/pr01.html
index b219875b39..c248d8126d 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/pr01.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/pr01.html
@@ -130,7 +130,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/producer-flow-control.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/producer-flow-control.html
index 2ac5062257..c3f44e764e 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/producer-flow-control.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/producer-flow-control.html
@@ -315,7 +315,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -323,7 +323,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/queue-state-replication.html b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/queue-state-replication.html
index 28df92ef37..3f1ef196b4 100644
--- a/content/releases/qpid-cpp-1.39.0/cpp-broker/book/queue-state-replication.html
+++ b/content/releases/qpid-cpp-1.39.0/cpp-broker/book/queue-state-replication.html
@@ -353,7 +353,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -361,7 +361,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/index.html b/content/releases/qpid-cpp-1.39.0/index.html
index b6d193534b..6ebe6eb5b9 100644
--- a/content/releases/qpid-cpp-1.39.0/index.html
+++ b/content/releases/qpid-cpp-1.39.0/index.html
@@ -211,7 +211,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -219,7 +219,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/Message-Groups-Guide.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/Message-Groups-Guide.html
index 73d589eaf4..907f9424fb 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/Message-Groups-Guide.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/Message-Groups-Guide.html
@@ -223,7 +223,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -231,7 +231,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/acknowledgements.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/acknowledgements.html
index b7e0631bb0..844287d6a7 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/acknowledgements.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/acknowledgements.html
@@ -145,7 +145,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s02.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s02.html
index c4724e726b..ef7d3d1634 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s02.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s02.html
@@ -155,7 +155,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -163,7 +163,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s03.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s03.html
index 521a7cab0c..32b762b935 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s03.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s03.html
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s08.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s08.html
index 1d7c6995ee..8792e1030d 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s08.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s08.html
@@ -161,7 +161,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s09.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s09.html
index 0c9858bcf1..00fbfa88ab 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s09.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s09.html
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s12.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s12.html
index 992764c079..0a283faf05 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s12.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s12.html
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s13.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s13.html
index afd4bb002f..9ce8480825 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s13.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s13.html
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s14.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s14.html
index 594bfb2999..1d17f075d6 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s14.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s14.html
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s15.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s15.html
index 1cd2929cc6..e01f3f62ee 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s15.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch01s15.html
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02.html
index 95ea38c583..a248d34024 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02.html
@@ -165,7 +165,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -173,7 +173,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02s02.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02s02.html
index befee36752..75804b39ac 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02s02.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02s02.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02s03.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02s03.html
index 774544a8d1..be5e2af1de 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02s03.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/ch02s03.html
@@ -163,7 +163,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -171,7 +171,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/connections.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/connections.html
index 7c26948caf..86464914cb 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/connections.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/connections.html
@@ -282,7 +282,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -290,7 +290,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/index.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/index.html
index a6d8d1bc7b..986139bd6f 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/index.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/index.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/prefetch.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/prefetch.html
index 8b1ba9e164..8b48882011 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/prefetch.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/prefetch.html
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/replay.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/replay.html
index 216319a0b0..9455a8d252 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/replay.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/replay.html
@@ -149,7 +149,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-Maps.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-Maps.html
index 2497a24d5d..2a3e05a3fb 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-Maps.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-Maps.html
@@ -281,7 +281,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -289,7 +289,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-addresses.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-addresses.html
index 2bd688865c..9a01816ad5 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-addresses.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-addresses.html
@@ -701,7 +701,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -709,7 +709,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-amqp0-10-mapping.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-amqp0-10-mapping.html
index 474c7b4ba4..9f7d9adc53 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-amqp0-10-mapping.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/section-amqp0-10-mapping.html
@@ -288,7 +288,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -296,7 +296,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/book/using-the-qpid-messaging-api.html b/content/releases/qpid-cpp-1.39.0/messaging-api/book/using-the-qpid-messaging-api.html
index b396166437..db930fabfe 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/book/using-the-qpid-messaging-api.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/book/using-the-qpid-messaging-api.html
@@ -194,7 +194,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -202,7 +202,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/OptionParser.cpp.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/OptionParser.cpp.html
index 4e763277fb..ddc6a96daf 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/OptionParser.cpp.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/OptionParser.cpp.html
@@ -367,7 +367,7 @@ <h1>OptionParser.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -375,7 +375,7 @@ <h1>OptionParser.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/OptionParser.h.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/OptionParser.h.html
index b16e2d6dbf..6bd33046da 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/OptionParser.h.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/OptionParser.h.html
@@ -167,7 +167,7 @@ <h1>OptionParser.h</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h1>OptionParser.h</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/client.cpp.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/client.cpp.html
index ccffe4666e..850a831233 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/client.cpp.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/client.cpp.html
@@ -187,7 +187,7 @@ <h1>client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h1>client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/drain.cpp.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/drain.cpp.html
index 77f39f0416..e9d567b133 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/drain.cpp.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/drain.cpp.html
@@ -221,7 +221,7 @@ <h1>drain.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -229,7 +229,7 @@ <h1>drain.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/hello_world.cpp.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/hello_world.cpp.html
index 2918fe2d1e..37514757d3 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/hello_world.cpp.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/hello_world.cpp.html
@@ -169,7 +169,7 @@ <h1>hello_world.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -177,7 +177,7 @@ <h1>hello_world.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/hello_xml.cpp.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/hello_xml.cpp.html
index f8c2e820fa..1cce0c0103 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/hello_xml.cpp.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/hello_xml.cpp.html
@@ -196,7 +196,7 @@ <h1>hello_xml.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -204,7 +204,7 @@ <h1>hello_xml.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
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 fdc30c3adc..3f5cc52904 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
@@ -149,7 +149,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/map_receiver.cpp.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/map_receiver.cpp.html
index 5829e04ba1..8c7f9059a3 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/map_receiver.cpp.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/map_receiver.cpp.html
@@ -167,7 +167,7 @@ <h1>map_receiver.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h1>map_receiver.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/map_sender.cpp.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/map_sender.cpp.html
index db4b6a838c..7e6cef4bcc 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/map_sender.cpp.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/map_sender.cpp.html
@@ -180,7 +180,7 @@ <h1>map_sender.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -188,7 +188,7 @@ <h1>map_sender.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/server.cpp.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/server.cpp.html
index cd5b77610b..e72f16bc66 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/server.cpp.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/server.cpp.html
@@ -201,7 +201,7 @@ <h1>server.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -209,7 +209,7 @@ <h1>server.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/server_reconnect.cpp.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/server_reconnect.cpp.html
index ce7887e3e9..be6e0a83f3 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/server_reconnect.cpp.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/server_reconnect.cpp.html
@@ -206,7 +206,7 @@ <h1>server_reconnect.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -214,7 +214,7 @@ <h1>server_reconnect.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/spout.cpp.html b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/spout.cpp.html
index 48b828478d..f6d904981f 100644
--- a/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/spout.cpp.html
+++ b/content/releases/qpid-cpp-1.39.0/messaging-api/cpp/examples/spout.cpp.html
@@ -297,7 +297,7 @@ <h1>spout.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -305,7 +305,7 @@ <h1>spout.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-cpp-1.39.0/release-notes.html b/content/releases/qpid-cpp-1.39.0/release-notes.html
index 895c074c3e..a97fae7976 100644
--- a/content/releases/qpid-cpp-1.39.0/release-notes.html
+++ b/content/releases/qpid-cpp-1.39.0/release-notes.html
@@ -155,7 +155,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -163,7 +163,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-dispatch-1.19.0/index.html b/content/releases/qpid-dispatch-1.19.0/index.html
index 926fdd1020..50e0c6722d 100644
--- a/content/releases/qpid-dispatch-1.19.0/index.html
+++ b/content/releases/qpid-dispatch-1.19.0/index.html
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -203,7 +203,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-dispatch-1.19.0/man/qdmanage.html b/content/releases/qpid-dispatch-1.19.0/man/qdmanage.html
index 6b7d9b7d68..8d8d7425fd 100644
--- a/content/releases/qpid-dispatch-1.19.0/man/qdmanage.html
+++ b/content/releases/qpid-dispatch-1.19.0/man/qdmanage.html
@@ -376,7 +376,7 @@ <h2 id="_see_also">SEE ALSO</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -384,7 +384,7 @@ <h2 id="_see_also">SEE ALSO</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-dispatch-1.19.0/man/qdrouterd.conf.html b/content/releases/qpid-dispatch-1.19.0/man/qdrouterd.conf.html
index be5e2cd55b..138aaa7553 100644
--- a/content/releases/qpid-dispatch-1.19.0/man/qdrouterd.conf.html
+++ b/content/releases/qpid-dispatch-1.19.0/man/qdrouterd.conf.html
@@ -1725,7 +1725,7 @@ <h2 id="_see_also">SEE ALSO</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1733,7 +1733,7 @@ <h2 id="_see_also">SEE ALSO</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-dispatch-1.19.0/man/qdrouterd.html b/content/releases/qpid-dispatch-1.19.0/man/qdrouterd.html
index ee0c5caf1c..8594490ee9 100644
--- a/content/releases/qpid-dispatch-1.19.0/man/qdrouterd.html
+++ b/content/releases/qpid-dispatch-1.19.0/man/qdrouterd.html
@@ -186,7 +186,7 @@ <h2 id="_see_also">SEE ALSO</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -194,7 +194,7 @@ <h2 id="_see_also">SEE ALSO</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-dispatch-1.19.0/man/qdstat.html b/content/releases/qpid-dispatch-1.19.0/man/qdstat.html
index dc6bcfcf47..5146df5293 100644
--- a/content/releases/qpid-dispatch-1.19.0/man/qdstat.html
+++ b/content/releases/qpid-dispatch-1.19.0/man/qdstat.html
@@ -1895,7 +1895,7 @@ <h2 id="_see_also">SEE ALSO</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1903,7 +1903,7 @@ <h2 id="_see_also">SEE ALSO</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-dispatch-1.19.0/release-notes.html b/content/releases/qpid-dispatch-1.19.0/release-notes.html
index f9c526cd64..2fae49823d 100644
--- a/content/releases/qpid-dispatch-1.19.0/release-notes.html
+++ b/content/releases/qpid-dispatch-1.19.0/release-notes.html
@@ -176,7 +176,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-dispatch-1.19.0/user-guide/index.html b/content/releases/qpid-dispatch-1.19.0/user-guide/index.html
index f77f4d0f44..671bec63ea 100644
--- a/content/releases/qpid-dispatch-1.19.0/user-guide/index.html
+++ b/content/releases/qpid-dispatch-1.19.0/user-guide/index.html
@@ -6489,7 +6489,7 @@ <h3 id="implementation_of_the_amqp_management_specification" class="discrete">Im
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -6497,7 +6497,7 @@ <h3 id="implementation_of_the_amqp_management_specification" class="discrete">Im
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-interop-test-0.3.0/QUICKSTART.html b/content/releases/qpid-interop-test-0.3.0/QUICKSTART.html
index 2b7e093498..5ae53540b5 100644
--- a/content/releases/qpid-interop-test-0.3.0/QUICKSTART.html
+++ b/content/releases/qpid-interop-test-0.3.0/QUICKSTART.html
@@ -340,7 +340,7 @@ <h2 id="5-containers">5. Containers</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -348,7 +348,7 @@ <h2 id="5-containers">5. Containers</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-interop-test-0.3.0/USERSGUIDE.html b/content/releases/qpid-interop-test-0.3.0/USERSGUIDE.html
index 5feb18e369..d882b9adbe 100644
--- a/content/releases/qpid-interop-test-0.3.0/USERSGUIDE.html
+++ b/content/releases/qpid-interop-test-0.3.0/USERSGUIDE.html
@@ -1293,7 +1293,7 @@ <h3 id="72-run-qit-from-a-container">7.2 Run QIT from a Container</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -1301,7 +1301,7 @@ <h3 id="72-run-qit-from-a-container">7.2 Run QIT from a Container</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-interop-test-0.3.0/index.html b/content/releases/qpid-interop-test-0.3.0/index.html
index 5377829a10..fe1d3f0c2a 100644
--- a/content/releases/qpid-interop-test-0.3.0/index.html
+++ b/content/releases/qpid-interop-test-0.3.0/index.html
@@ -182,7 +182,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-interop-test-0.3.0/release-notes.html b/content/releases/qpid-interop-test-0.3.0/release-notes.html
index 30b26886bb..295d37cf0c 100644
--- a/content/releases/qpid-interop-test-0.3.0/release-notes.html
+++ b/content/releases/qpid-interop-test-0.3.0/release-notes.html
@@ -147,7 +147,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-0.60.1/building.html b/content/releases/qpid-jms-0.60.1/building.html
index 28b7196447..fa3a9157e5 100644
--- a/content/releases/qpid-jms-0.60.1/building.html
+++ b/content/releases/qpid-jms-0.60.1/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-0.60.1/docs/index.html b/content/releases/qpid-jms-0.60.1/docs/index.html
index 929de0bcda..a97bf627c5 100644
--- a/content/releases/qpid-jms-0.60.1/docs/index.html
+++ b/content/releases/qpid-jms-0.60.1/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-0.60.1/index.html b/content/releases/qpid-jms-0.60.1/index.html
index eff0da7156..d9ef007f4c 100644
--- a/content/releases/qpid-jms-0.60.1/index.html
+++ b/content/releases/qpid-jms-0.60.1/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-0.60.1/release-notes.html b/content/releases/qpid-jms-0.60.1/release-notes.html
index 8b14b9b21c..358e69e935 100644
--- a/content/releases/qpid-jms-0.60.1/release-notes.html
+++ b/content/releases/qpid-jms-0.60.1/release-notes.html
@@ -157,7 +157,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-0.61.0/building.html b/content/releases/qpid-jms-0.61.0/building.html
index cc501fdc0b..1a11ce16b6 100644
--- a/content/releases/qpid-jms-0.61.0/building.html
+++ b/content/releases/qpid-jms-0.61.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-0.61.0/docs/index.html b/content/releases/qpid-jms-0.61.0/docs/index.html
index 916d55ccd4..f0ddc36f63 100644
--- a/content/releases/qpid-jms-0.61.0/docs/index.html
+++ b/content/releases/qpid-jms-0.61.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-0.61.0/index.html b/content/releases/qpid-jms-0.61.0/index.html
index 3870f3807f..2d319f854f 100644
--- a/content/releases/qpid-jms-0.61.0/index.html
+++ b/content/releases/qpid-jms-0.61.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-0.61.0/release-notes.html b/content/releases/qpid-jms-0.61.0/release-notes.html
index bf8326e64b..437532e722 100644
--- a/content/releases/qpid-jms-0.61.0/release-notes.html
+++ b/content/releases/qpid-jms-0.61.0/release-notes.html
@@ -148,7 +148,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.10.0/building.html b/content/releases/qpid-jms-1.10.0/building.html
index 1f99e1e795..eb373413cd 100644
--- a/content/releases/qpid-jms-1.10.0/building.html
+++ b/content/releases/qpid-jms-1.10.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.10.0/docs/index.html b/content/releases/qpid-jms-1.10.0/docs/index.html
index 84aa0d39c1..1cb432e40c 100644
--- a/content/releases/qpid-jms-1.10.0/docs/index.html
+++ b/content/releases/qpid-jms-1.10.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.10.0/index.html b/content/releases/qpid-jms-1.10.0/index.html
index 0cc339366e..a5f1e7b567 100644
--- a/content/releases/qpid-jms-1.10.0/index.html
+++ b/content/releases/qpid-jms-1.10.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.10.0/release-notes.html b/content/releases/qpid-jms-1.10.0/release-notes.html
index 7995ffaff6..368945dd3e 100644
--- a/content/releases/qpid-jms-1.10.0/release-notes.html
+++ b/content/releases/qpid-jms-1.10.0/release-notes.html
@@ -141,7 +141,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.11.0/building.html b/content/releases/qpid-jms-1.11.0/building.html
index dd8b95cbac..c227ebef03 100644
--- a/content/releases/qpid-jms-1.11.0/building.html
+++ b/content/releases/qpid-jms-1.11.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.11.0/docs/index.html b/content/releases/qpid-jms-1.11.0/docs/index.html
index 473602b00e..8afe4b162c 100644
--- a/content/releases/qpid-jms-1.11.0/docs/index.html
+++ b/content/releases/qpid-jms-1.11.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.11.0/index.html b/content/releases/qpid-jms-1.11.0/index.html
index 128b6d53e0..9367cb572a 100644
--- a/content/releases/qpid-jms-1.11.0/index.html
+++ b/content/releases/qpid-jms-1.11.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.11.0/release-notes.html b/content/releases/qpid-jms-1.11.0/release-notes.html
index 1711790231..97c47967f9 100644
--- a/content/releases/qpid-jms-1.11.0/release-notes.html
+++ b/content/releases/qpid-jms-1.11.0/release-notes.html
@@ -140,7 +140,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.12.0/building.html b/content/releases/qpid-jms-1.12.0/building.html
index f74a549c13..a559648dca 100644
--- a/content/releases/qpid-jms-1.12.0/building.html
+++ b/content/releases/qpid-jms-1.12.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.12.0/docs/index.html b/content/releases/qpid-jms-1.12.0/docs/index.html
index 214dd90bcb..3cce8a9ec1 100644
--- a/content/releases/qpid-jms-1.12.0/docs/index.html
+++ b/content/releases/qpid-jms-1.12.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.12.0/index.html b/content/releases/qpid-jms-1.12.0/index.html
index a6cae61763..1afe15ce81 100644
--- a/content/releases/qpid-jms-1.12.0/index.html
+++ b/content/releases/qpid-jms-1.12.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.12.0/release-notes.html b/content/releases/qpid-jms-1.12.0/release-notes.html
index 28e1b6a4f9..49b622c9cb 100644
--- a/content/releases/qpid-jms-1.12.0/release-notes.html
+++ b/content/releases/qpid-jms-1.12.0/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.12.1/building.html b/content/releases/qpid-jms-1.12.1/building.html
index 1fa538f659..f2c6b6721d 100644
--- a/content/releases/qpid-jms-1.12.1/building.html
+++ b/content/releases/qpid-jms-1.12.1/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.12.1/docs/index.html b/content/releases/qpid-jms-1.12.1/docs/index.html
index d7faced6ea..e55d88730a 100644
--- a/content/releases/qpid-jms-1.12.1/docs/index.html
+++ b/content/releases/qpid-jms-1.12.1/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.12.1/index.html b/content/releases/qpid-jms-1.12.1/index.html
index 1b79e63a55..602245fdc7 100644
--- a/content/releases/qpid-jms-1.12.1/index.html
+++ b/content/releases/qpid-jms-1.12.1/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.12.1/release-notes.html b/content/releases/qpid-jms-1.12.1/release-notes.html
index 1df1612961..47404072ef 100644
--- a/content/releases/qpid-jms-1.12.1/release-notes.html
+++ b/content/releases/qpid-jms-1.12.1/release-notes.html
@@ -138,7 +138,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.13.0/building.html b/content/releases/qpid-jms-1.13.0/building.html
index e1da2335ba..9bd89e2f5c 100644
--- a/content/releases/qpid-jms-1.13.0/building.html
+++ b/content/releases/qpid-jms-1.13.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.13.0/docs/index.html b/content/releases/qpid-jms-1.13.0/docs/index.html
index 91dd7281b5..fc56567d4f 100644
--- a/content/releases/qpid-jms-1.13.0/docs/index.html
+++ b/content/releases/qpid-jms-1.13.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.13.0/index.html b/content/releases/qpid-jms-1.13.0/index.html
index 3a44f3d1e9..421a0824a3 100644
--- a/content/releases/qpid-jms-1.13.0/index.html
+++ b/content/releases/qpid-jms-1.13.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.13.0/release-notes.html b/content/releases/qpid-jms-1.13.0/release-notes.html
index 90c0226608..67e09297a1 100644
--- a/content/releases/qpid-jms-1.13.0/release-notes.html
+++ b/content/releases/qpid-jms-1.13.0/release-notes.html
@@ -140,7 +140,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.14.0/building.html b/content/releases/qpid-jms-1.14.0/building.html
index 4c05d512de..f588732b14 100644
--- a/content/releases/qpid-jms-1.14.0/building.html
+++ b/content/releases/qpid-jms-1.14.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.14.0/docs/index.html b/content/releases/qpid-jms-1.14.0/docs/index.html
index 45f2109e54..6f1934be84 100644
--- a/content/releases/qpid-jms-1.14.0/docs/index.html
+++ b/content/releases/qpid-jms-1.14.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.14.0/index.html b/content/releases/qpid-jms-1.14.0/index.html
index ffa6ae9d4e..701299f155 100644
--- a/content/releases/qpid-jms-1.14.0/index.html
+++ b/content/releases/qpid-jms-1.14.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.14.0/release-notes.html b/content/releases/qpid-jms-1.14.0/release-notes.html
index eb56a540fe..eae9753b50 100644
--- a/content/releases/qpid-jms-1.14.0/release-notes.html
+++ b/content/releases/qpid-jms-1.14.0/release-notes.html
@@ -141,7 +141,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.15.0/building.html b/content/releases/qpid-jms-1.15.0/building.html
index 7dcaa71833..17e04f6d0d 100644
--- a/content/releases/qpid-jms-1.15.0/building.html
+++ b/content/releases/qpid-jms-1.15.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.15.0/docs/index.html b/content/releases/qpid-jms-1.15.0/docs/index.html
index b592f7d2b6..fef81d9ace 100644
--- a/content/releases/qpid-jms-1.15.0/docs/index.html
+++ b/content/releases/qpid-jms-1.15.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.15.0/index.html b/content/releases/qpid-jms-1.15.0/index.html
index 7b2b039151..d494bc27dd 100644
--- a/content/releases/qpid-jms-1.15.0/index.html
+++ b/content/releases/qpid-jms-1.15.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.15.0/release-notes.html b/content/releases/qpid-jms-1.15.0/release-notes.html
index 0dd1d53db3..2f3dd90a1a 100644
--- a/content/releases/qpid-jms-1.15.0/release-notes.html
+++ b/content/releases/qpid-jms-1.15.0/release-notes.html
@@ -139,7 +139,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.16.0/building.html b/content/releases/qpid-jms-1.16.0/building.html
index bf911e6342..acd5dd556f 100644
--- a/content/releases/qpid-jms-1.16.0/building.html
+++ b/content/releases/qpid-jms-1.16.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.16.0/docs/index.html b/content/releases/qpid-jms-1.16.0/docs/index.html
index 0e4d08cc5c..1ac2f693c5 100644
--- a/content/releases/qpid-jms-1.16.0/docs/index.html
+++ b/content/releases/qpid-jms-1.16.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.16.0/index.html b/content/releases/qpid-jms-1.16.0/index.html
index 9a0feedb9e..4a9dc6a677 100644
--- a/content/releases/qpid-jms-1.16.0/index.html
+++ b/content/releases/qpid-jms-1.16.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.16.0/release-notes.html b/content/releases/qpid-jms-1.16.0/release-notes.html
index 1cdef74bc6..ae20e314ef 100644
--- a/content/releases/qpid-jms-1.16.0/release-notes.html
+++ b/content/releases/qpid-jms-1.16.0/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.17.0/building.html b/content/releases/qpid-jms-1.17.0/building.html
index 2d38813827..66b1591371 100644
--- a/content/releases/qpid-jms-1.17.0/building.html
+++ b/content/releases/qpid-jms-1.17.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.17.0/docs/index.html b/content/releases/qpid-jms-1.17.0/docs/index.html
index 4761fac888..48b33efc0d 100644
--- a/content/releases/qpid-jms-1.17.0/docs/index.html
+++ b/content/releases/qpid-jms-1.17.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.17.0/index.html b/content/releases/qpid-jms-1.17.0/index.html
index 38c99c7b00..48764b72c2 100644
--- a/content/releases/qpid-jms-1.17.0/index.html
+++ b/content/releases/qpid-jms-1.17.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.17.0/release-notes.html b/content/releases/qpid-jms-1.17.0/release-notes.html
index bcdd335043..c15edafd5a 100644
--- a/content/releases/qpid-jms-1.17.0/release-notes.html
+++ b/content/releases/qpid-jms-1.17.0/release-notes.html
@@ -158,7 +158,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -166,7 +166,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.2.0/building.html b/content/releases/qpid-jms-1.2.0/building.html
index 41b4f4bd56..fe4c6c464c 100644
--- a/content/releases/qpid-jms-1.2.0/building.html
+++ b/content/releases/qpid-jms-1.2.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.2.0/docs/index.html b/content/releases/qpid-jms-1.2.0/docs/index.html
index 1f9f49d6c3..e5e9a43ab7 100644
--- a/content/releases/qpid-jms-1.2.0/docs/index.html
+++ b/content/releases/qpid-jms-1.2.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.2.0/index.html b/content/releases/qpid-jms-1.2.0/index.html
index 6ed1261024..58353a8ba7 100644
--- a/content/releases/qpid-jms-1.2.0/index.html
+++ b/content/releases/qpid-jms-1.2.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.2.0/release-notes.html b/content/releases/qpid-jms-1.2.0/release-notes.html
index 72a9478f71..7987479c5d 100644
--- a/content/releases/qpid-jms-1.2.0/release-notes.html
+++ b/content/releases/qpid-jms-1.2.0/release-notes.html
@@ -147,7 +147,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.3.0/building.html b/content/releases/qpid-jms-1.3.0/building.html
index 3a773979c9..b5de8d05b7 100644
--- a/content/releases/qpid-jms-1.3.0/building.html
+++ b/content/releases/qpid-jms-1.3.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.3.0/docs/index.html b/content/releases/qpid-jms-1.3.0/docs/index.html
index 9c28116285..57f1833cef 100644
--- a/content/releases/qpid-jms-1.3.0/docs/index.html
+++ b/content/releases/qpid-jms-1.3.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.3.0/index.html b/content/releases/qpid-jms-1.3.0/index.html
index 5a76523efe..c751174962 100644
--- a/content/releases/qpid-jms-1.3.0/index.html
+++ b/content/releases/qpid-jms-1.3.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.3.0/release-notes.html b/content/releases/qpid-jms-1.3.0/release-notes.html
index 5bd7a85164..792d629162 100644
--- a/content/releases/qpid-jms-1.3.0/release-notes.html
+++ b/content/releases/qpid-jms-1.3.0/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.4.1/building.html b/content/releases/qpid-jms-1.4.1/building.html
index 9ef4cb7bde..cf2478a4a5 100644
--- a/content/releases/qpid-jms-1.4.1/building.html
+++ b/content/releases/qpid-jms-1.4.1/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.4.1/docs/index.html b/content/releases/qpid-jms-1.4.1/docs/index.html
index c83f23348f..7c2cedc374 100644
--- a/content/releases/qpid-jms-1.4.1/docs/index.html
+++ b/content/releases/qpid-jms-1.4.1/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.4.1/index.html b/content/releases/qpid-jms-1.4.1/index.html
index 3671c700ac..37c3cf22f0 100644
--- a/content/releases/qpid-jms-1.4.1/index.html
+++ b/content/releases/qpid-jms-1.4.1/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.4.1/release-notes.html b/content/releases/qpid-jms-1.4.1/release-notes.html
index fe815ee6bc..99ac1a770b 100644
--- a/content/releases/qpid-jms-1.4.1/release-notes.html
+++ b/content/releases/qpid-jms-1.4.1/release-notes.html
@@ -142,7 +142,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.5.0/building.html b/content/releases/qpid-jms-1.5.0/building.html
index c045f347b0..b105da48f0 100644
--- a/content/releases/qpid-jms-1.5.0/building.html
+++ b/content/releases/qpid-jms-1.5.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.5.0/docs/index.html b/content/releases/qpid-jms-1.5.0/docs/index.html
index 314d54afe8..16202fb7e6 100644
--- a/content/releases/qpid-jms-1.5.0/docs/index.html
+++ b/content/releases/qpid-jms-1.5.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.5.0/index.html b/content/releases/qpid-jms-1.5.0/index.html
index 6ef6744bf6..9184ac40f8 100644
--- a/content/releases/qpid-jms-1.5.0/index.html
+++ b/content/releases/qpid-jms-1.5.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.5.0/release-notes.html b/content/releases/qpid-jms-1.5.0/release-notes.html
index c287b12433..202cedf4f4 100644
--- a/content/releases/qpid-jms-1.5.0/release-notes.html
+++ b/content/releases/qpid-jms-1.5.0/release-notes.html
@@ -148,7 +148,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.6.0/building.html b/content/releases/qpid-jms-1.6.0/building.html
index c28f7a855d..46f81d32d6 100644
--- a/content/releases/qpid-jms-1.6.0/building.html
+++ b/content/releases/qpid-jms-1.6.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.6.0/docs/index.html b/content/releases/qpid-jms-1.6.0/docs/index.html
index 3fe863fd0c..3f9d38880f 100644
--- a/content/releases/qpid-jms-1.6.0/docs/index.html
+++ b/content/releases/qpid-jms-1.6.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.6.0/index.html b/content/releases/qpid-jms-1.6.0/index.html
index e1a00fc601..672a636cc4 100644
--- a/content/releases/qpid-jms-1.6.0/index.html
+++ b/content/releases/qpid-jms-1.6.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.6.0/release-notes.html b/content/releases/qpid-jms-1.6.0/release-notes.html
index 1766b54c28..dfebe3ae24 100644
--- a/content/releases/qpid-jms-1.6.0/release-notes.html
+++ b/content/releases/qpid-jms-1.6.0/release-notes.html
@@ -148,7 +148,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.7.0/building.html b/content/releases/qpid-jms-1.7.0/building.html
index 315937bd8e..69144274ea 100644
--- a/content/releases/qpid-jms-1.7.0/building.html
+++ b/content/releases/qpid-jms-1.7.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.7.0/docs/index.html b/content/releases/qpid-jms-1.7.0/docs/index.html
index 1941d7e6ee..68998f3ae1 100644
--- a/content/releases/qpid-jms-1.7.0/docs/index.html
+++ b/content/releases/qpid-jms-1.7.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.7.0/index.html b/content/releases/qpid-jms-1.7.0/index.html
index 75b21cddf1..871ea7f061 100644
--- a/content/releases/qpid-jms-1.7.0/index.html
+++ b/content/releases/qpid-jms-1.7.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.7.0/release-notes.html b/content/releases/qpid-jms-1.7.0/release-notes.html
index d0bf034f18..b2adaed484 100644
--- a/content/releases/qpid-jms-1.7.0/release-notes.html
+++ b/content/releases/qpid-jms-1.7.0/release-notes.html
@@ -149,7 +149,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.8.0/building.html b/content/releases/qpid-jms-1.8.0/building.html
index e0adc8463a..c79b24e4f2 100644
--- a/content/releases/qpid-jms-1.8.0/building.html
+++ b/content/releases/qpid-jms-1.8.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.8.0/docs/index.html b/content/releases/qpid-jms-1.8.0/docs/index.html
index 7a322b02a0..62b23cf77e 100644
--- a/content/releases/qpid-jms-1.8.0/docs/index.html
+++ b/content/releases/qpid-jms-1.8.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.8.0/index.html b/content/releases/qpid-jms-1.8.0/index.html
index 13a85600c6..03783f0546 100644
--- a/content/releases/qpid-jms-1.8.0/index.html
+++ b/content/releases/qpid-jms-1.8.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.8.0/release-notes.html b/content/releases/qpid-jms-1.8.0/release-notes.html
index 7f37bb2402..98511166e7 100644
--- a/content/releases/qpid-jms-1.8.0/release-notes.html
+++ b/content/releases/qpid-jms-1.8.0/release-notes.html
@@ -138,7 +138,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.9.0/building.html b/content/releases/qpid-jms-1.9.0/building.html
index 6b08b50a0c..541cf5d494 100644
--- a/content/releases/qpid-jms-1.9.0/building.html
+++ b/content/releases/qpid-jms-1.9.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.9.0/docs/index.html b/content/releases/qpid-jms-1.9.0/docs/index.html
index 786b49ab98..9bf4fcebf3 100644
--- a/content/releases/qpid-jms-1.9.0/docs/index.html
+++ b/content/releases/qpid-jms-1.9.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.9.0/index.html b/content/releases/qpid-jms-1.9.0/index.html
index 9a794b65ad..28d5111c6e 100644
--- a/content/releases/qpid-jms-1.9.0/index.html
+++ b/content/releases/qpid-jms-1.9.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-1.9.0/release-notes.html b/content/releases/qpid-jms-1.9.0/release-notes.html
index dbf37f43f5..6e6e213888 100644
--- a/content/releases/qpid-jms-1.9.0/release-notes.html
+++ b/content/releases/qpid-jms-1.9.0/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.0.0/building.html b/content/releases/qpid-jms-2.0.0/building.html
index e061bc2241..1ef13b9d89 100644
--- a/content/releases/qpid-jms-2.0.0/building.html
+++ b/content/releases/qpid-jms-2.0.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.0.0/docs/index.html b/content/releases/qpid-jms-2.0.0/docs/index.html
index 73f3f1a036..2ec0c08179 100644
--- a/content/releases/qpid-jms-2.0.0/docs/index.html
+++ b/content/releases/qpid-jms-2.0.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.0.0/index.html b/content/releases/qpid-jms-2.0.0/index.html
index b98f32f5f1..77b18073ed 100644
--- a/content/releases/qpid-jms-2.0.0/index.html
+++ b/content/releases/qpid-jms-2.0.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.0.0/release-notes.html b/content/releases/qpid-jms-2.0.0/release-notes.html
index bc428aeaee..a6697cd49e 100644
--- a/content/releases/qpid-jms-2.0.0/release-notes.html
+++ b/content/releases/qpid-jms-2.0.0/release-notes.html
@@ -144,7 +144,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.1.0/building.html b/content/releases/qpid-jms-2.1.0/building.html
index 6d37f38183..6427847db5 100644
--- a/content/releases/qpid-jms-2.1.0/building.html
+++ b/content/releases/qpid-jms-2.1.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.1.0/docs/index.html b/content/releases/qpid-jms-2.1.0/docs/index.html
index e1c6497228..efb090f57d 100644
--- a/content/releases/qpid-jms-2.1.0/docs/index.html
+++ b/content/releases/qpid-jms-2.1.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.1.0/index.html b/content/releases/qpid-jms-2.1.0/index.html
index b767e36ede..7e6948ba3a 100644
--- a/content/releases/qpid-jms-2.1.0/index.html
+++ b/content/releases/qpid-jms-2.1.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.1.0/release-notes.html b/content/releases/qpid-jms-2.1.0/release-notes.html
index efb0360adf..db087b6cf6 100644
--- a/content/releases/qpid-jms-2.1.0/release-notes.html
+++ b/content/releases/qpid-jms-2.1.0/release-notes.html
@@ -155,7 +155,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -163,7 +163,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.10.0/building.html b/content/releases/qpid-jms-2.10.0/building.html
index c4216f80b2..4996c7477c 100644
--- a/content/releases/qpid-jms-2.10.0/building.html
+++ b/content/releases/qpid-jms-2.10.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.10.0/docs/index.html b/content/releases/qpid-jms-2.10.0/docs/index.html
index e947e10ba4..33852500ef 100644
--- a/content/releases/qpid-jms-2.10.0/docs/index.html
+++ b/content/releases/qpid-jms-2.10.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.10.0/index.html b/content/releases/qpid-jms-2.10.0/index.html
index 19276a734f..e7d3722911 100644
--- a/content/releases/qpid-jms-2.10.0/index.html
+++ b/content/releases/qpid-jms-2.10.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.10.0/release-notes.html b/content/releases/qpid-jms-2.10.0/release-notes.html
index 19da2d7ba5..16f79e2cc9 100644
--- a/content/releases/qpid-jms-2.10.0/release-notes.html
+++ b/content/releases/qpid-jms-2.10.0/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.11.0/building.html b/content/releases/qpid-jms-2.11.0/building.html
index d086ee2d0e..c6388af29c 100644
--- a/content/releases/qpid-jms-2.11.0/building.html
+++ b/content/releases/qpid-jms-2.11.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.11.0/docs/index.html b/content/releases/qpid-jms-2.11.0/docs/index.html
index b0cb118277..fc4f0ded25 100644
--- a/content/releases/qpid-jms-2.11.0/docs/index.html
+++ b/content/releases/qpid-jms-2.11.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.11.0/index.html b/content/releases/qpid-jms-2.11.0/index.html
index 04a26cfb29..12a27f6ab0 100644
--- a/content/releases/qpid-jms-2.11.0/index.html
+++ b/content/releases/qpid-jms-2.11.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.11.0/release-notes.html b/content/releases/qpid-jms-2.11.0/release-notes.html
index 2929bde7bb..4e7c733f9b 100644
--- a/content/releases/qpid-jms-2.11.0/release-notes.html
+++ b/content/releases/qpid-jms-2.11.0/release-notes.html
@@ -158,7 +158,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -166,7 +166,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.2.0/building.html b/content/releases/qpid-jms-2.2.0/building.html
index 665a1e7a3d..dd7b72ae17 100644
--- a/content/releases/qpid-jms-2.2.0/building.html
+++ b/content/releases/qpid-jms-2.2.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.2.0/docs/index.html b/content/releases/qpid-jms-2.2.0/docs/index.html
index 7f5fac6375..9271203c2a 100644
--- a/content/releases/qpid-jms-2.2.0/docs/index.html
+++ b/content/releases/qpid-jms-2.2.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.2.0/index.html b/content/releases/qpid-jms-2.2.0/index.html
index c1a85ea52e..fd85227491 100644
--- a/content/releases/qpid-jms-2.2.0/index.html
+++ b/content/releases/qpid-jms-2.2.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.2.0/release-notes.html b/content/releases/qpid-jms-2.2.0/release-notes.html
index f6fec9105b..404a562ba2 100644
--- a/content/releases/qpid-jms-2.2.0/release-notes.html
+++ b/content/releases/qpid-jms-2.2.0/release-notes.html
@@ -138,7 +138,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.3.0/building.html b/content/releases/qpid-jms-2.3.0/building.html
index ecede0c385..7fac0dd3e2 100644
--- a/content/releases/qpid-jms-2.3.0/building.html
+++ b/content/releases/qpid-jms-2.3.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.3.0/docs/index.html b/content/releases/qpid-jms-2.3.0/docs/index.html
index fe2b00a4b3..991f3ec082 100644
--- a/content/releases/qpid-jms-2.3.0/docs/index.html
+++ b/content/releases/qpid-jms-2.3.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.3.0/index.html b/content/releases/qpid-jms-2.3.0/index.html
index b15c03f5dd..054a39e544 100644
--- a/content/releases/qpid-jms-2.3.0/index.html
+++ b/content/releases/qpid-jms-2.3.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.3.0/release-notes.html b/content/releases/qpid-jms-2.3.0/release-notes.html
index 73c8cc52c5..2c3b7f9f72 100644
--- a/content/releases/qpid-jms-2.3.0/release-notes.html
+++ b/content/releases/qpid-jms-2.3.0/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.4.0/building.html b/content/releases/qpid-jms-2.4.0/building.html
index 3cf596ecdb..6588bb2603 100644
--- a/content/releases/qpid-jms-2.4.0/building.html
+++ b/content/releases/qpid-jms-2.4.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.4.0/docs/index.html b/content/releases/qpid-jms-2.4.0/docs/index.html
index 09d9597826..126c0c1d0c 100644
--- a/content/releases/qpid-jms-2.4.0/docs/index.html
+++ b/content/releases/qpid-jms-2.4.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.4.0/index.html b/content/releases/qpid-jms-2.4.0/index.html
index 29aa5bf6de..0cd55b132a 100644
--- a/content/releases/qpid-jms-2.4.0/index.html
+++ b/content/releases/qpid-jms-2.4.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.4.0/release-notes.html b/content/releases/qpid-jms-2.4.0/release-notes.html
index 1d1840653f..a7c5a949d0 100644
--- a/content/releases/qpid-jms-2.4.0/release-notes.html
+++ b/content/releases/qpid-jms-2.4.0/release-notes.html
@@ -141,7 +141,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.5.0/building.html b/content/releases/qpid-jms-2.5.0/building.html
index 9e5754eeb8..2f10cb29f5 100644
--- a/content/releases/qpid-jms-2.5.0/building.html
+++ b/content/releases/qpid-jms-2.5.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.5.0/docs/index.html b/content/releases/qpid-jms-2.5.0/docs/index.html
index fbc0c28817..537d6e33e1 100644
--- a/content/releases/qpid-jms-2.5.0/docs/index.html
+++ b/content/releases/qpid-jms-2.5.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.5.0/index.html b/content/releases/qpid-jms-2.5.0/index.html
index 8e63df9da8..8b9145bff0 100644
--- a/content/releases/qpid-jms-2.5.0/index.html
+++ b/content/releases/qpid-jms-2.5.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.5.0/release-notes.html b/content/releases/qpid-jms-2.5.0/release-notes.html
index 396234f1ba..d17c55b329 100644
--- a/content/releases/qpid-jms-2.5.0/release-notes.html
+++ b/content/releases/qpid-jms-2.5.0/release-notes.html
@@ -140,7 +140,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.6.0/building.html b/content/releases/qpid-jms-2.6.0/building.html
index 98a55432d7..4acee5d4e0 100644
--- a/content/releases/qpid-jms-2.6.0/building.html
+++ b/content/releases/qpid-jms-2.6.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.6.0/docs/index.html b/content/releases/qpid-jms-2.6.0/docs/index.html
index b4436f92ae..25ac589636 100644
--- a/content/releases/qpid-jms-2.6.0/docs/index.html
+++ b/content/releases/qpid-jms-2.6.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.6.0/index.html b/content/releases/qpid-jms-2.6.0/index.html
index 5cacca9228..8c89700298 100644
--- a/content/releases/qpid-jms-2.6.0/index.html
+++ b/content/releases/qpid-jms-2.6.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.6.0/release-notes.html b/content/releases/qpid-jms-2.6.0/release-notes.html
index 509ce3a5b9..428ce9578c 100644
--- a/content/releases/qpid-jms-2.6.0/release-notes.html
+++ b/content/releases/qpid-jms-2.6.0/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.6.1/building.html b/content/releases/qpid-jms-2.6.1/building.html
index c80dae48ff..a1e46f3f99 100644
--- a/content/releases/qpid-jms-2.6.1/building.html
+++ b/content/releases/qpid-jms-2.6.1/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.6.1/docs/index.html b/content/releases/qpid-jms-2.6.1/docs/index.html
index bdefb5cb9b..56485bd58d 100644
--- a/content/releases/qpid-jms-2.6.1/docs/index.html
+++ b/content/releases/qpid-jms-2.6.1/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.6.1/index.html b/content/releases/qpid-jms-2.6.1/index.html
index fdbf34c80c..179e48b0b7 100644
--- a/content/releases/qpid-jms-2.6.1/index.html
+++ b/content/releases/qpid-jms-2.6.1/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.6.1/release-notes.html b/content/releases/qpid-jms-2.6.1/release-notes.html
index 751fef1ac9..f419459feb 100644
--- a/content/releases/qpid-jms-2.6.1/release-notes.html
+++ b/content/releases/qpid-jms-2.6.1/release-notes.html
@@ -138,7 +138,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.7.0/building.html b/content/releases/qpid-jms-2.7.0/building.html
index de1ad3cd4c..bf3a977bae 100644
--- a/content/releases/qpid-jms-2.7.0/building.html
+++ b/content/releases/qpid-jms-2.7.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.7.0/docs/index.html b/content/releases/qpid-jms-2.7.0/docs/index.html
index 8103bcc12c..7db798726e 100644
--- a/content/releases/qpid-jms-2.7.0/docs/index.html
+++ b/content/releases/qpid-jms-2.7.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.7.0/index.html b/content/releases/qpid-jms-2.7.0/index.html
index 43a221bfa0..61d36f7adf 100644
--- a/content/releases/qpid-jms-2.7.0/index.html
+++ b/content/releases/qpid-jms-2.7.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.7.0/release-notes.html b/content/releases/qpid-jms-2.7.0/release-notes.html
index 681f382d60..e191924f8c 100644
--- a/content/releases/qpid-jms-2.7.0/release-notes.html
+++ b/content/releases/qpid-jms-2.7.0/release-notes.html
@@ -140,7 +140,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.8.0/building.html b/content/releases/qpid-jms-2.8.0/building.html
index 28a140dda8..f7ab11e033 100644
--- a/content/releases/qpid-jms-2.8.0/building.html
+++ b/content/releases/qpid-jms-2.8.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.8.0/docs/index.html b/content/releases/qpid-jms-2.8.0/docs/index.html
index d88483d4f6..5ae636585e 100644
--- a/content/releases/qpid-jms-2.8.0/docs/index.html
+++ b/content/releases/qpid-jms-2.8.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.8.0/index.html b/content/releases/qpid-jms-2.8.0/index.html
index e2003ed91e..da5443a0bd 100644
--- a/content/releases/qpid-jms-2.8.0/index.html
+++ b/content/releases/qpid-jms-2.8.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.8.0/release-notes.html b/content/releases/qpid-jms-2.8.0/release-notes.html
index e0651ab908..de796d8ec2 100644
--- a/content/releases/qpid-jms-2.8.0/release-notes.html
+++ b/content/releases/qpid-jms-2.8.0/release-notes.html
@@ -141,7 +141,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.9.0/building.html b/content/releases/qpid-jms-2.9.0/building.html
index e99e22f4a4..3ea5342449 100644
--- a/content/releases/qpid-jms-2.9.0/building.html
+++ b/content/releases/qpid-jms-2.9.0/building.html
@@ -175,7 +175,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h2 id="distribution-assemblies">Distribution assemblies</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.9.0/docs/index.html b/content/releases/qpid-jms-2.9.0/docs/index.html
index 9a4cafaa1f..e6e948effe 100644
--- a/content/releases/qpid-jms-2.9.0/docs/index.html
+++ b/content/releases/qpid-jms-2.9.0/docs/index.html
@@ -565,7 +565,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -573,7 +573,7 @@ <h2 id="authenticating-using-kerberos">Authenticating using Kerberos</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.9.0/index.html b/content/releases/qpid-jms-2.9.0/index.html
index 9b9619a541..7547e8096a 100644
--- a/content/releases/qpid-jms-2.9.0/index.html
+++ b/content/releases/qpid-jms-2.9.0/index.html
@@ -191,7 +191,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -199,7 +199,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-2.9.0/release-notes.html b/content/releases/qpid-jms-2.9.0/release-notes.html
index 4d50e9474e..b6e68693a9 100644
--- a/content/releases/qpid-jms-2.9.0/release-notes.html
+++ b/content/releases/qpid-jms-2.9.0/release-notes.html
@@ -139,7 +139,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Drain.java.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Drain.java.html
index 67e66bc9bf..4933d28108 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Drain.java.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Drain.java.html
@@ -213,7 +213,7 @@ <h1>Drain.java</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -221,7 +221,7 @@ <h1>Drain.java</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Hello.java.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Hello.java.html
index c03a758caa..56054de82f 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Hello.java.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Hello.java.html
@@ -192,7 +192,7 @@ <h1>Hello.java</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -200,7 +200,7 @@ <h1>Hello.java</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/ListReceiver.java.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/ListReceiver.java.html
index 02e550a152..3e3072893b 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/ListReceiver.java.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/ListReceiver.java.html
@@ -210,7 +210,7 @@ <h1>ListReceiver.java</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -218,7 +218,7 @@ <h1>ListReceiver.java</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/ListSender.java.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/ListSender.java.html
index 2802d68bf8..0121677a24 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/ListSender.java.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/ListSender.java.html
@@ -195,7 +195,7 @@ <h1>ListSender.java</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -203,7 +203,7 @@ <h1>ListSender.java</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/MapReceiver.java.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/MapReceiver.java.html
index 4fcbda5faf..05a63ef23d 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/MapReceiver.java.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/MapReceiver.java.html
@@ -161,7 +161,7 @@ <h1>MapReceiver.java</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -169,7 +169,7 @@ <h1>MapReceiver.java</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/MapSender.java.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/MapSender.java.html
index 8093e3adf5..f4c899fb5d 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/MapSender.java.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/MapSender.java.html
@@ -192,7 +192,7 @@ <h1>MapSender.java</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -200,7 +200,7 @@ <h1>MapSender.java</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/OptionParser.java.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/OptionParser.java.html
index 092283396e..32ff84cd1b 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/OptionParser.java.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/OptionParser.java.html
@@ -461,7 +461,7 @@ <h1>OptionParser.java</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -469,7 +469,7 @@ <h1>OptionParser.java</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Spout.java.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Spout.java.html
index b13a5adffb..e021ddafc9 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Spout.java.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/Spout.java.html
@@ -259,7 +259,7 @@ <h1>Spout.java</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -267,7 +267,7 @@ <h1>Spout.java</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/hello.properties.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/hello.properties.html
index 5786309347..0244ac4d94 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/hello.properties.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/hello.properties.html
@@ -139,7 +139,7 @@ <h1>hello.properties</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h1>hello.properties</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/index.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/index.html
index 8c89907e02..63e73a5f65 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/index.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/examples/index.html
@@ -147,7 +147,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/index.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/index.html
index 1258e75310..e9c9bbb88c 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/index.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/index.html
@@ -196,7 +196,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -204,7 +204,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Book.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Book.html
index 1e514e242d..2d41c8d7d8 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Book.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Book.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-Addresses.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-Addresses.html
index a730b391f6..8ced668bdd 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-Addresses.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-Addresses.html
@@ -708,7 +708,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -716,7 +716,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-JNDI.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-JNDI.html
index dffab96d35..3dc292ccb5 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-JNDI.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-JNDI.html
@@ -413,7 +413,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -421,7 +421,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-JVM-Properties.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-JVM-Properties.html
index 4c231a3eff..6d178612d2 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-JVM-Properties.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-JVM-Properties.html
@@ -167,7 +167,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-Logging.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-Logging.html
index a8201b651b..04f0169824 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-Logging.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring-Logging.html
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -141,7 +141,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring.html
index d8085f0403..0d7d9befae 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Configuring.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Example.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Example.html
index 0572014e7c..aec42bb32f 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Example.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Example.html
@@ -202,7 +202,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -210,7 +210,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Miscellaneous-MapMessages.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Miscellaneous-MapMessages.html
index ddff8981b6..54987e9d6a 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Miscellaneous-MapMessages.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Miscellaneous-MapMessages.html
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -180,7 +180,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Miscellaneous.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Miscellaneous.html
index c3e62abd9b..8417b454f4 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Miscellaneous.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/JMS-Client-0-10-Miscellaneous.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/index.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/index.html
index d8c6d55617..1227a0a68d 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/index.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-10-book/index.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Exceptions.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Exceptions.html
index 35663b7f4b..68ba8c2b16 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Exceptions.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Exceptions.html
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-Binding.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-Binding.html
index e3e322953c..adb2ed13f8 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-Binding.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-Binding.html
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-ConnectAttemptListener.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-ConnectAttemptListener.html
index 86f853f8eb..af0c6ff336 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-ConnectAttemptListener.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-ConnectAttemptListener.html
@@ -171,7 +171,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -179,7 +179,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-Queue.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-Queue.html
index 36684dec4d..32533a6d98 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-Queue.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions-Queue.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions.html
index e51c0503b9..340aa6e913 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-JMS-Extensions.html
@@ -170,7 +170,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Maven.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Maven.html
index 8469ce0788..b1a8515833 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Maven.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Maven.html
@@ -156,7 +156,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-PooledConnecytionFactory.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-PooledConnecytionFactory.html
index 3018f66cbf..1a0620ce70 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-PooledConnecytionFactory.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-PooledConnecytionFactory.html
@@ -176,7 +176,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-ProducerFlowControl-Impact.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-ProducerFlowControl-Impact.html
index 9189c40f02..b21c0b429b 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-ProducerFlowControl-Impact.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-ProducerFlowControl-Impact.html
@@ -164,7 +164,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -172,7 +172,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Tomcat-JNDI-Integration.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Tomcat-JNDI-Integration.html
index 89078dd880..c16005dd2b 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Tomcat-JNDI-Integration.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Appendix-Tomcat-JNDI-Integration.html
@@ -247,7 +247,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -255,7 +255,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Binding-URL.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Binding-URL.html
index 79d886b9d4..49af1bf28b 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Binding-URL.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Binding-URL.html
@@ -203,7 +203,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -211,7 +211,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Connection.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Connection.html
index bfe8054e18..c72e812ecb 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Connection.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Connection.html
@@ -196,7 +196,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -204,7 +204,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-ConnectionFactory.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-ConnectionFactory.html
index ca155fed51..103e8d18c6 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-ConnectionFactory.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-ConnectionFactory.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Destinations.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Destinations.html
index bdf5205d12..9839a26298 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Destinations.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Destinations.html
@@ -130,7 +130,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-MessageConsumer.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-MessageConsumer.html
index 76b71517da..50638c1f98 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-MessageConsumer.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-MessageConsumer.html
@@ -152,7 +152,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-MessageProducer.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-MessageProducer.html
index 6ebc2557ff..d9037daba2 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-MessageProducer.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-MessageProducer.html
@@ -171,7 +171,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -179,7 +179,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Session.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Session.html
index a22fdf3823..d47d67954e 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Session.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding-Session.html
@@ -189,7 +189,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding.html
index 16abec80e4..64756d54d2 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Client-Understanding.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Connection-URL.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Connection-URL.html
index 0ecba811b4..3d0fbf5b99 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Connection-URL.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Connection-URL.html
@@ -250,7 +250,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -258,7 +258,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Document-Scope-And-Intended-Audience.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Document-Scope-And-Intended-Audience.html
index c3e26d9380..5c9fa54746 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Document-Scope-And-Intended-Audience.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Document-Scope-And-Intended-Audience.html
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -150,7 +150,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Examples-PubSub.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Examples-PubSub.html
index 1b58497431..813f57616a 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Examples-PubSub.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Examples-PubSub.html
@@ -197,7 +197,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -205,7 +205,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Examples.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Examples.html
index e34f16624c..0312281669 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Examples.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Examples.html
@@ -199,7 +199,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -207,7 +207,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Introduction.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Introduction.html
index 76937128a5..4cfa203db6 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Introduction.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Introduction.html
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JMS-Getting-And-Dependencies-Dependencies.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JMS-Getting-And-Dependencies-Dependencies.html
index 4cbf483c9a..b1a3f4c215 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JMS-Getting-And-Dependencies-Dependencies.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JMS-Getting-And-Dependencies-Dependencies.html
@@ -129,7 +129,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -137,7 +137,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JMS-Getting-And-Dependencies.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JMS-Getting-And-Dependencies.html
index 1a21250441..f4d2d827bc 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JMS-Getting-And-Dependencies.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JMS-Getting-And-Dependencies.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Destination.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Destination.html
index 571116b9b7..556f8f18ed 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Destination.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Destination.html
@@ -127,7 +127,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Queue.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Queue.html
index 5e0990bf83..99cebae68d 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Queue.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Queue.html
@@ -126,7 +126,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -134,7 +134,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Topic.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Topic.html
index 46229864fb..09f3a70bbe 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Topic.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format-Topic.html
@@ -128,7 +128,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format.html
index 68013c26e6..38f22be57e 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-JNDI-Properties-Format.html
@@ -138,7 +138,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Logging-EnablingDebugLogging.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Logging-EnablingDebugLogging.html
index ed9b7b05e0..e31889bb92 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Logging-EnablingDebugLogging.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Logging-EnablingDebugLogging.html
@@ -132,7 +132,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -140,7 +140,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Logging.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Logging.html
index bf41e5e9e6..b026672ae4 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Logging.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-Logging.html
@@ -136,7 +136,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -144,7 +144,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-System-Properties.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-System-Properties.html
index 51fcd87e03..b90d3b83b3 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-System-Properties.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-0-8-System-Properties.html
@@ -261,7 +261,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -269,7 +269,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Book.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Book.html
index e387b53a10..2747e1cb9c 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Book.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Book.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Example.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Example.html
index 4f4f3932a6..6e8820b98e 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Example.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Example.html
@@ -307,7 +307,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -315,7 +315,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Receiving.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Receiving.html
index 6ac1c7862c..5d4a827841 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Receiving.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Receiving.html
@@ -135,7 +135,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -143,7 +143,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Sending.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Sending.html
index 771bcab507..998dfc45b8 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Sending.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption-Sending.html
@@ -184,7 +184,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption.html
index 4d8ed91fb9..e29171af46 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/JMS-Client-Message-Encryption.html
@@ -158,7 +158,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -166,7 +166,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/index.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/index.html
index b0f3b871d8..e7c3f83341 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/index.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/jms-amqp-0-8-book/index.html
@@ -131,7 +131,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -139,7 +139,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-jms-amqp-0-x-6.4.0/release-notes.html b/content/releases/qpid-jms-amqp-0-x-6.4.0/release-notes.html
index 07a8d3e256..38521b1c1a 100644
--- a/content/releases/qpid-jms-amqp-0-x-6.4.0/release-notes.html
+++ b/content/releases/qpid-jms-amqp-0-x-6.4.0/release-notes.html
@@ -151,7 +151,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -159,7 +159,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/index.html b/content/releases/qpid-proton-0.36.0/index.html
index 8d5dcfad93..dfd0b7b165 100644
--- a/content/releases/qpid-proton-0.36.0/index.html
+++ b/content/releases/qpid-proton-0.36.0/index.html
@@ -192,7 +192,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -200,7 +200,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/broker.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/broker.cpp.html
index a317d9b038..7a514f57d4 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/broker.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/broker.cpp.html
@@ -538,7 +538,7 @@ <h1>broker.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -546,7 +546,7 @@ <h1>broker.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/client.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/client.cpp.html
index f0f556415c..eceea1e14c 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/client.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/client.cpp.html
@@ -217,7 +217,7 @@ <h1>client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -225,7 +225,7 @@ <h1>client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/colour_send.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/colour_send.cpp.html
index 2493077253..31ce40edf3 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/colour_send.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/colour_send.cpp.html
@@ -224,7 +224,7 @@ <h1>colour_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -232,7 +232,7 @@ <h1>colour_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/connection_options.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/connection_options.cpp.html
index 311b79c80c..3df1ec360c 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/connection_options.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/connection_options.cpp.html
@@ -184,7 +184,7 @@ <h1>connection_options.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h1>connection_options.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/direct_recv.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/direct_recv.cpp.html
index 006243f978..74c0e544e6 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/direct_recv.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/direct_recv.cpp.html
@@ -209,7 +209,7 @@ <h1>direct_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -217,7 +217,7 @@ <h1>direct_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/direct_send.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/direct_send.cpp.html
index 99295d0dec..59c4e3bbbf 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/direct_send.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/direct_send.cpp.html
@@ -220,7 +220,7 @@ <h1>direct_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -228,7 +228,7 @@ <h1>direct_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/encode_decode.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/encode_decode.cpp.html
index 02f99f1391..d72c276133 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/encode_decode.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/encode_decode.cpp.html
@@ -362,7 +362,7 @@ <h1>encode_decode.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -370,7 +370,7 @@ <h1>encode_decode.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/flow_control.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/flow_control.cpp.html
index f86faae837..68aae42fb1 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/flow_control.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/flow_control.cpp.html
@@ -369,7 +369,7 @@ <h1>flow_control.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -377,7 +377,7 @@ <h1>flow_control.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/helloworld.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/helloworld.cpp.html
index 8b9371fc80..782864a9e7 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/helloworld.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/helloworld.cpp.html
@@ -184,7 +184,7 @@ <h1>helloworld.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h1>helloworld.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/index.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/index.html
index 56e5695f34..1b287e9b8a 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/index.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/index.html
@@ -164,7 +164,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -172,7 +172,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/message_properties.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/message_properties.cpp.html
index 670555e074..f5553ab85f 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/message_properties.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/message_properties.cpp.html
@@ -212,7 +212,7 @@ <h1>message_properties.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -220,7 +220,7 @@ <h1>message_properties.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/multithreaded_client.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/multithreaded_client.cpp.html
index 82b08f6c68..11e9704f2a 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/multithreaded_client.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/multithreaded_client.cpp.html
@@ -296,7 +296,7 @@ <h1>multithreaded_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -304,7 +304,7 @@ <h1>multithreaded_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
index cf682dc0ae..3f6bac4005 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
@@ -427,7 +427,7 @@ <h1>multithreaded_client_flow_control.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -435,7 +435,7 @@ <h1>multithreaded_client_flow_control.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/options.hpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/options.hpp.html
index c81349ae37..5e3eeb83ce 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/options.hpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/options.hpp.html
@@ -286,7 +286,7 @@ <h1>options.hpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -294,7 +294,7 @@ <h1>options.hpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/queue_browser.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/queue_browser.cpp.html
index 0752de9216..60d8eac80d 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/queue_browser.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/queue_browser.cpp.html
@@ -178,7 +178,7 @@ <h1>queue_browser.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1>queue_browser.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/reconnect_client.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/reconnect_client.cpp.html
index 624eaf8722..2dddde1e23 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/reconnect_client.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/reconnect_client.cpp.html
@@ -251,7 +251,7 @@ <h1>reconnect_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -259,7 +259,7 @@ <h1>reconnect_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/scheduled_send.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/scheduled_send.cpp.html
index 4e9fbbf599..bb511a0b83 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/scheduled_send.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/scheduled_send.cpp.html
@@ -229,7 +229,7 @@ <h1>scheduled_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -237,7 +237,7 @@ <h1>scheduled_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/scheduled_send_03.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/scheduled_send_03.cpp.html
index fe43e2caaa..c13237828d 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/scheduled_send_03.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/scheduled_send_03.cpp.html
@@ -226,7 +226,7 @@ <h1>scheduled_send_03.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>scheduled_send_03.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/selected_recv.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/selected_recv.cpp.html
index c66d91c20d..b9f776b03b 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/selected_recv.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/selected_recv.cpp.html
@@ -198,7 +198,7 @@ <h1>selected_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -206,7 +206,7 @@ <h1>selected_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/server.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/server.cpp.html
index 1e212d0e0f..b9620b94f3 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/server.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/server.cpp.html
@@ -203,7 +203,7 @@ <h1>server.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -211,7 +211,7 @@ <h1>server.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/server_direct.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/server_direct.cpp.html
index 90b830711e..5968d096bb 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/server_direct.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/server_direct.cpp.html
@@ -238,7 +238,7 @@ <h1>server_direct.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -246,7 +246,7 @@ <h1>server_direct.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/service_bus.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/service_bus.cpp.html
index 58edcf5bfa..93181292d9 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/service_bus.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/service_bus.cpp.html
@@ -379,7 +379,7 @@ <h1>service_bus.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -387,7 +387,7 @@ <h1>service_bus.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_connect.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_connect.cpp.html
index bba210f7fe..cd3cb046de 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_connect.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_connect.cpp.html
@@ -215,7 +215,7 @@ <h1>simple_connect.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -223,7 +223,7 @@ <h1>simple_connect.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_recv.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_recv.cpp.html
index deadff2599..6003ff1347 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_recv.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_recv.cpp.html
@@ -211,7 +211,7 @@ <h1>simple_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -219,7 +219,7 @@ <h1>simple_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_send.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_send.cpp.html
index 86f73366fe..bbb85e3d11 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_send.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/simple_send.cpp.html
@@ -232,7 +232,7 @@ <h1>simple_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -240,7 +240,7 @@ <h1>simple_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/ssl.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/ssl.cpp.html
index 620e9f9799..5f1a2ec34b 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/ssl.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/ssl.cpp.html
@@ -345,7 +345,7 @@ <h1>ssl.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -353,7 +353,7 @@ <h1>ssl.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/ssl_client_cert.cpp.html b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/ssl_client_cert.cpp.html
index be49e4e40d..ba983796ab 100644
--- a/content/releases/qpid-proton-0.36.0/proton/cpp/examples/ssl_client_cert.cpp.html
+++ b/content/releases/qpid-proton-0.36.0/proton/cpp/examples/ssl_client_cert.cpp.html
@@ -311,7 +311,7 @@ <h1>ssl_client_cert.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -319,7 +319,7 @@ <h1>ssl_client_cert.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/abstract_server.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/abstract_server.py.html
index 1b4b33dad2..a65270498f 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/abstract_server.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/abstract_server.py.html
@@ -147,7 +147,7 @@ <h1>abstract_server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h1>abstract_server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/broker.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/broker.py.html
index 6f7c6b4a03..7bd325ac71 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/broker.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/broker.py.html
@@ -253,7 +253,7 @@ <h1>broker.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -261,7 +261,7 @@ <h1>broker.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/client.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/client.py.html
index dfc24d7ef1..c5a5237ecf 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/client.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/client.py.html
@@ -175,7 +175,7 @@ <h1>client.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h1>client.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/client_http.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/client_http.py.html
index 746d215a69..5c47416666 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/client_http.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/client_http.py.html
@@ -226,7 +226,7 @@ <h1>client_http.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>client_http.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/colour_send.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/colour_send.py.html
index a40f542fb4..03e388c640 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/colour_send.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/colour_send.py.html
@@ -180,7 +180,7 @@ <h1>colour_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -188,7 +188,7 @@ <h1>colour_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/db_common.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/db_common.py.html
index fba1d2d9d6..0cfb08d79b 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/db_common.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/db_common.py.html
@@ -226,7 +226,7 @@ <h1>db_common.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>db_common.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/db_ctrl.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/db_ctrl.py.html
index d914a0ddd2..c6f5368f6b 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/db_ctrl.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/db_ctrl.py.html
@@ -157,7 +157,7 @@ <h1>db_ctrl.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h1>db_ctrl.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/db_recv.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/db_recv.py.html
index 9918660dc8..f5246bc3d7 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/db_recv.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/db_recv.py.html
@@ -189,7 +189,7 @@ <h1>db_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>db_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/db_send.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/db_send.py.html
index 0a69564e85..a95a5f8980 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/db_send.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/db_send.py.html
@@ -220,7 +220,7 @@ <h1>db_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -228,7 +228,7 @@ <h1>db_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/direct_recv.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/direct_recv.py.html
index cf7955d992..df4974d5a7 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/direct_recv.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/direct_recv.py.html
@@ -169,7 +169,7 @@ <h1>direct_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -177,7 +177,7 @@ <h1>direct_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/direct_send.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/direct_send.py.html
index 251802904c..bec2bc80d0 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/direct_send.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/direct_send.py.html
@@ -176,7 +176,7 @@ <h1>direct_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h1>direct_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld.py.html
index d051ae2f9e..335bcdf335 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld.py.html
@@ -156,7 +156,7 @@ <h1>helloworld.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h1>helloworld.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_blocking.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_blocking.py.html
index bb4d132c78..0bf524f18b 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_blocking.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_blocking.py.html
@@ -141,7 +141,7 @@ <h1>helloworld_blocking.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h1>helloworld_blocking.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_direct.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_direct.py.html
index cb1649c61f..d5457dcc19 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_direct.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_direct.py.html
@@ -159,7 +159,7 @@ <h1>helloworld_direct.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h1>helloworld_direct.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_direct_tornado.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_direct_tornado.py.html
index d8b1ad535f..99a8ce7f69 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_direct_tornado.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_direct_tornado.py.html
@@ -159,7 +159,7 @@ <h1>helloworld_direct_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h1>helloworld_direct_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_tornado.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_tornado.py.html
index b41d11007a..e8bd551ded 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_tornado.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/helloworld_tornado.py.html
@@ -156,7 +156,7 @@ <h1>helloworld_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h1>helloworld_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/index.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/index.html
index 8e303d413b..3b9212e047 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/index.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/index.html
@@ -170,7 +170,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/proton_server.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/proton_server.py.html
index 1a76bb05a7..57abcb5912 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/proton_server.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/proton_server.py.html
@@ -162,7 +162,7 @@ <h1>proton_server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -170,7 +170,7 @@ <h1>proton_server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/proton_tornado.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/proton_tornado.py.html
index 1dc7e5ca71..7e9f588601 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/proton_tornado.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/proton_tornado.py.html
@@ -233,7 +233,7 @@ <h1>proton_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -241,7 +241,7 @@ <h1>proton_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/queue_browser.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/queue_browser.py.html
index 13212fa234..b9a3c43d23 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/queue_browser.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/queue_browser.py.html
@@ -152,7 +152,7 @@ <h1>queue_browser.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h1>queue_browser.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/recurring_timer.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/recurring_timer.py.html
index 8bf56ddf41..9aa523f260 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/recurring_timer.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/recurring_timer.py.html
@@ -152,7 +152,7 @@ <h1>recurring_timer.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h1>recurring_timer.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/recurring_timer_tornado.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/recurring_timer_tornado.py.html
index 0b72d74f7a..88594fc7ae 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/recurring_timer_tornado.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/recurring_timer_tornado.py.html
@@ -153,7 +153,7 @@ <h1>recurring_timer_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -161,7 +161,7 @@ <h1>recurring_timer_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/selected_recv.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/selected_recv.py.html
index 208a1b0996..0baacd2660 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/selected_recv.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/selected_recv.py.html
@@ -166,7 +166,7 @@ <h1>selected_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h1>selected_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/server.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/server.py.html
index f2a6113a18..4b8674c2f3 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/server.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/server.py.html
@@ -166,7 +166,7 @@ <h1>server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h1>server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/server_direct.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/server_direct.py.html
index 0cf4c98c9c..d249b6a5ea 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/server_direct.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/server_direct.py.html
@@ -174,7 +174,7 @@ <h1>server_direct.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h1>server_direct.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/server_tx.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/server_tx.py.html
index 98aae3bc1b..96d53fc72a 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/server_tx.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/server_tx.py.html
@@ -188,7 +188,7 @@ <h1>server_tx.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -196,7 +196,7 @@ <h1>server_tx.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/simple_recv.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/simple_recv.py.html
index 7be130505f..ca531b6935 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/simple_recv.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/simple_recv.py.html
@@ -168,7 +168,7 @@ <h1>simple_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h1>simple_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/simple_send.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/simple_send.py.html
index 2a036a143d..9bd6583e63 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/simple_send.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/simple_send.py.html
@@ -175,7 +175,7 @@ <h1>simple_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h1>simple_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/sync_client.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/sync_client.py.html
index a8b774fc90..1339756afb 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/sync_client.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/sync_client.py.html
@@ -160,7 +160,7 @@ <h1>sync_client.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h1>sync_client.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/test_examples.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/test_examples.py.html
index fdd9b40178..c59309d798 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/test_examples.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/test_examples.py.html
@@ -283,7 +283,7 @@ <h1>test_examples.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -291,7 +291,7 @@ <h1>test_examples.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_recv.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_recv.py.html
index d1c64226f5..bc08e1898d 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_recv.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_recv.py.html
@@ -189,7 +189,7 @@ <h1>tx_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>tx_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_recv_interactive.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_recv_interactive.py.html
index d7706d38ff..6c9504fb1c 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_recv_interactive.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_recv_interactive.py.html
@@ -195,7 +195,7 @@ <h1>tx_recv_interactive.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -203,7 +203,7 @@ <h1>tx_recv_interactive.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_send.py.html b/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_send.py.html
index cc71ddb2f4..6f1ef0aaae 100644
--- a/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_send.py.html
+++ b/content/releases/qpid-proton-0.36.0/proton/python/examples/tx_send.py.html
@@ -201,7 +201,7 @@ <h1>tx_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -209,7 +209,7 @@ <h1>tx_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/broker.rb.html b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/broker.rb.html
index 5478413fd9..7b54fe4bde 100644
--- a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/broker.rb.html
+++ b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/broker.rb.html
@@ -285,7 +285,7 @@ <h1>broker.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -293,7 +293,7 @@ <h1>broker.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/client.rb.html b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/client.rb.html
index 9b9d92d476..e52818ca07 100644
--- a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/client.rb.html
+++ b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/client.rb.html
@@ -190,7 +190,7 @@ <h1>client.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -198,7 +198,7 @@ <h1>client.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/direct_recv.rb.html b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/direct_recv.rb.html
index 27f7d589ee..ad1f72146c 100644
--- a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/direct_recv.rb.html
+++ b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/direct_recv.rb.html
@@ -171,7 +171,7 @@ <h1>direct_recv.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -179,7 +179,7 @@ <h1>direct_recv.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/direct_send.rb.html b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/direct_send.rb.html
index 61363f64c9..a11a3ffcb9 100644
--- a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/direct_send.rb.html
+++ b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/direct_send.rb.html
@@ -178,7 +178,7 @@ <h1>direct_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1>direct_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/helloworld.rb.html b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/helloworld.rb.html
index c4226d14e0..ce054d58cd 100644
--- a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/helloworld.rb.html
+++ b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/helloworld.rb.html
@@ -168,7 +168,7 @@ <h1>helloworld.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h1>helloworld.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/index.html b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/index.html
index ef90bc81a8..aa7352b557 100644
--- a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/index.html
+++ b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/index.html
@@ -147,7 +147,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/server.rb.html b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/server.rb.html
index 88a1dc6011..6988eaaf99 100644
--- a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/server.rb.html
+++ b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/server.rb.html
@@ -181,7 +181,7 @@ <h1>server.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -189,7 +189,7 @@ <h1>server.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/simple_recv.rb.html b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/simple_recv.rb.html
index ca4e89cdfe..675d4d9a64 100644
--- a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/simple_recv.rb.html
+++ b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/simple_recv.rb.html
@@ -167,7 +167,7 @@ <h1>simple_recv.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h1>simple_recv.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/simple_send.rb.html b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/simple_send.rb.html
index 3dcd39ad74..9a672477bf 100644
--- a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/simple_send.rb.html
+++ b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/simple_send.rb.html
@@ -174,7 +174,7 @@ <h1>simple_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h1>simple_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/ssl_send.rb.html b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/ssl_send.rb.html
index 8589cb72f8..6fe91d57da 100644
--- a/content/releases/qpid-proton-0.36.0/proton/ruby/examples/ssl_send.rb.html
+++ b/content/releases/qpid-proton-0.36.0/proton/ruby/examples/ssl_send.rb.html
@@ -182,7 +182,7 @@ <h1>ssl_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h1>ssl_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.36.0/release-notes.html b/content/releases/qpid-proton-0.36.0/release-notes.html
index cc361f3138..f5d56c82ee 100644
--- a/content/releases/qpid-proton-0.36.0/release-notes.html
+++ b/content/releases/qpid-proton-0.36.0/release-notes.html
@@ -162,7 +162,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -170,7 +170,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/index.html b/content/releases/qpid-proton-0.37.0/index.html
index 395f42e434..097ade52a5 100644
--- a/content/releases/qpid-proton-0.37.0/index.html
+++ b/content/releases/qpid-proton-0.37.0/index.html
@@ -192,7 +192,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -200,7 +200,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/broker.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/broker.cpp.html
index 29415876d3..4c81ab5f1f 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/broker.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/broker.cpp.html
@@ -538,7 +538,7 @@ <h1>broker.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -546,7 +546,7 @@ <h1>broker.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/client.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/client.cpp.html
index a96a9414a0..effdd91bd5 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/client.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/client.cpp.html
@@ -217,7 +217,7 @@ <h1>client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -225,7 +225,7 @@ <h1>client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/colour_send.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/colour_send.cpp.html
index d22abf8bad..5443677635 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/colour_send.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/colour_send.cpp.html
@@ -224,7 +224,7 @@ <h1>colour_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -232,7 +232,7 @@ <h1>colour_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/connection_options.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/connection_options.cpp.html
index cb7adfbf42..866198aa9b 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/connection_options.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/connection_options.cpp.html
@@ -184,7 +184,7 @@ <h1>connection_options.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h1>connection_options.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/direct_recv.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/direct_recv.cpp.html
index 67da9dd46c..acbd5f8021 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/direct_recv.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/direct_recv.cpp.html
@@ -209,7 +209,7 @@ <h1>direct_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -217,7 +217,7 @@ <h1>direct_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/direct_send.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/direct_send.cpp.html
index e893649255..d97a7b51a3 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/direct_send.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/direct_send.cpp.html
@@ -220,7 +220,7 @@ <h1>direct_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -228,7 +228,7 @@ <h1>direct_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/encode_decode.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/encode_decode.cpp.html
index ec73ff4fae..3e879d08a6 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/encode_decode.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/encode_decode.cpp.html
@@ -362,7 +362,7 @@ <h1>encode_decode.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -370,7 +370,7 @@ <h1>encode_decode.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/flow_control.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/flow_control.cpp.html
index 194030731f..ee0c70acf8 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/flow_control.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/flow_control.cpp.html
@@ -369,7 +369,7 @@ <h1>flow_control.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -377,7 +377,7 @@ <h1>flow_control.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/helloworld.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/helloworld.cpp.html
index ecbf77f137..c3796b51ca 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/helloworld.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/helloworld.cpp.html
@@ -184,7 +184,7 @@ <h1>helloworld.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h1>helloworld.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/index.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/index.html
index 48f7530d57..6522e2c036 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/index.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/index.html
@@ -164,7 +164,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -172,7 +172,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/message_properties.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/message_properties.cpp.html
index 624603dcb7..13b3469372 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/message_properties.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/message_properties.cpp.html
@@ -212,7 +212,7 @@ <h1>message_properties.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -220,7 +220,7 @@ <h1>message_properties.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/multithreaded_client.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/multithreaded_client.cpp.html
index 15d4506262..a11d977e63 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/multithreaded_client.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/multithreaded_client.cpp.html
@@ -296,7 +296,7 @@ <h1>multithreaded_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -304,7 +304,7 @@ <h1>multithreaded_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
index 72d6fc31c9..1ca88a88ea 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
@@ -427,7 +427,7 @@ <h1>multithreaded_client_flow_control.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -435,7 +435,7 @@ <h1>multithreaded_client_flow_control.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/options.hpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/options.hpp.html
index 18b2822aba..6f05f484ed 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/options.hpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/options.hpp.html
@@ -286,7 +286,7 @@ <h1>options.hpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -294,7 +294,7 @@ <h1>options.hpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/queue_browser.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/queue_browser.cpp.html
index d72702ad96..281963fdfd 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/queue_browser.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/queue_browser.cpp.html
@@ -178,7 +178,7 @@ <h1>queue_browser.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1>queue_browser.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/reconnect_client.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/reconnect_client.cpp.html
index 3562177ced..20154d4f1f 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/reconnect_client.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/reconnect_client.cpp.html
@@ -249,7 +249,7 @@ <h1>reconnect_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -257,7 +257,7 @@ <h1>reconnect_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/scheduled_send.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/scheduled_send.cpp.html
index cef7956dc2..06ea46d67b 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/scheduled_send.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/scheduled_send.cpp.html
@@ -229,7 +229,7 @@ <h1>scheduled_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -237,7 +237,7 @@ <h1>scheduled_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/scheduled_send_03.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/scheduled_send_03.cpp.html
index e30c14ac45..2239e03b21 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/scheduled_send_03.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/scheduled_send_03.cpp.html
@@ -226,7 +226,7 @@ <h1>scheduled_send_03.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>scheduled_send_03.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/selected_recv.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/selected_recv.cpp.html
index 263bfe3e9a..921789a24e 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/selected_recv.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/selected_recv.cpp.html
@@ -198,7 +198,7 @@ <h1>selected_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -206,7 +206,7 @@ <h1>selected_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/server.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/server.cpp.html
index 66f2f74c14..74de9e9072 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/server.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/server.cpp.html
@@ -203,7 +203,7 @@ <h1>server.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -211,7 +211,7 @@ <h1>server.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/server_direct.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/server_direct.cpp.html
index e073b9a4ac..c63ada2c5c 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/server_direct.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/server_direct.cpp.html
@@ -238,7 +238,7 @@ <h1>server_direct.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -246,7 +246,7 @@ <h1>server_direct.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/service_bus.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/service_bus.cpp.html
index 7d257c9c46..06b5e99c62 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/service_bus.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/service_bus.cpp.html
@@ -379,7 +379,7 @@ <h1>service_bus.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -387,7 +387,7 @@ <h1>service_bus.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_connect.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_connect.cpp.html
index b250b73253..c75effac6d 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_connect.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_connect.cpp.html
@@ -215,7 +215,7 @@ <h1>simple_connect.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -223,7 +223,7 @@ <h1>simple_connect.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_recv.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_recv.cpp.html
index ff0a94c932..844c88d43b 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_recv.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_recv.cpp.html
@@ -211,7 +211,7 @@ <h1>simple_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -219,7 +219,7 @@ <h1>simple_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_send.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_send.cpp.html
index dd508bb65f..24665099c5 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_send.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/simple_send.cpp.html
@@ -232,7 +232,7 @@ <h1>simple_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -240,7 +240,7 @@ <h1>simple_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/ssl.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/ssl.cpp.html
index 4b11678092..3d353bd86b 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/ssl.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/ssl.cpp.html
@@ -345,7 +345,7 @@ <h1>ssl.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -353,7 +353,7 @@ <h1>ssl.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/ssl_client_cert.cpp.html b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/ssl_client_cert.cpp.html
index 346cf2c17e..c138894fa7 100644
--- a/content/releases/qpid-proton-0.37.0/proton/cpp/examples/ssl_client_cert.cpp.html
+++ b/content/releases/qpid-proton-0.37.0/proton/cpp/examples/ssl_client_cert.cpp.html
@@ -311,7 +311,7 @@ <h1>ssl_client_cert.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -319,7 +319,7 @@ <h1>ssl_client_cert.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/abstract_server.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/abstract_server.py.html
index dd38e6159c..6107239d26 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/abstract_server.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/abstract_server.py.html
@@ -147,7 +147,7 @@ <h1>abstract_server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h1>abstract_server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/broker.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/broker.py.html
index d14ff260de..1b0f67a818 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/broker.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/broker.py.html
@@ -253,7 +253,7 @@ <h1>broker.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -261,7 +261,7 @@ <h1>broker.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/client.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/client.py.html
index 637d30f000..de8f02791b 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/client.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/client.py.html
@@ -175,7 +175,7 @@ <h1>client.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h1>client.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/client_http.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/client_http.py.html
index 5893f520d5..c0d6f6e0f6 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/client_http.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/client_http.py.html
@@ -226,7 +226,7 @@ <h1>client_http.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>client_http.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/colour_send.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/colour_send.py.html
index f5a2de9bad..4956739950 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/colour_send.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/colour_send.py.html
@@ -180,7 +180,7 @@ <h1>colour_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -188,7 +188,7 @@ <h1>colour_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/db_common.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/db_common.py.html
index ede6a759ce..b336d7513f 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/db_common.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/db_common.py.html
@@ -226,7 +226,7 @@ <h1>db_common.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>db_common.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/db_ctrl.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/db_ctrl.py.html
index 040c2040bd..0fb46713e7 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/db_ctrl.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/db_ctrl.py.html
@@ -157,7 +157,7 @@ <h1>db_ctrl.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h1>db_ctrl.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/db_recv.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/db_recv.py.html
index ee3fffab0b..bab461d057 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/db_recv.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/db_recv.py.html
@@ -189,7 +189,7 @@ <h1>db_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>db_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/db_send.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/db_send.py.html
index ee3756192a..59db908021 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/db_send.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/db_send.py.html
@@ -220,7 +220,7 @@ <h1>db_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -228,7 +228,7 @@ <h1>db_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/direct_recv.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/direct_recv.py.html
index e878283d37..0a6b4d47d1 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/direct_recv.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/direct_recv.py.html
@@ -169,7 +169,7 @@ <h1>direct_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -177,7 +177,7 @@ <h1>direct_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/direct_send.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/direct_send.py.html
index 051a7b6cf2..40adc4bc92 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/direct_send.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/direct_send.py.html
@@ -176,7 +176,7 @@ <h1>direct_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h1>direct_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld.py.html
index 0cc4401816..a2ced15f3a 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld.py.html
@@ -156,7 +156,7 @@ <h1>helloworld.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h1>helloworld.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_blocking.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_blocking.py.html
index ea60bed442..7358991c79 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_blocking.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_blocking.py.html
@@ -141,7 +141,7 @@ <h1>helloworld_blocking.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h1>helloworld_blocking.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_direct.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_direct.py.html
index 81494426a4..353a8d1d5b 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_direct.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_direct.py.html
@@ -159,7 +159,7 @@ <h1>helloworld_direct.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h1>helloworld_direct.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_direct_tornado.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_direct_tornado.py.html
index 50116d936d..4563ae14ae 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_direct_tornado.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_direct_tornado.py.html
@@ -159,7 +159,7 @@ <h1>helloworld_direct_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h1>helloworld_direct_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_tornado.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_tornado.py.html
index 53900ef761..982aa37fc5 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_tornado.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/helloworld_tornado.py.html
@@ -156,7 +156,7 @@ <h1>helloworld_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h1>helloworld_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/index.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/index.html
index e8923bfd02..a759228369 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/index.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/index.html
@@ -170,7 +170,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/proton_server.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/proton_server.py.html
index eda4a6c030..e2cd2db86a 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/proton_server.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/proton_server.py.html
@@ -162,7 +162,7 @@ <h1>proton_server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -170,7 +170,7 @@ <h1>proton_server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/proton_tornado.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/proton_tornado.py.html
index e3c62c9d85..ca4a4299e2 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/proton_tornado.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/proton_tornado.py.html
@@ -233,7 +233,7 @@ <h1>proton_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -241,7 +241,7 @@ <h1>proton_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/queue_browser.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/queue_browser.py.html
index 1e24cc9f28..09dd32e679 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/queue_browser.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/queue_browser.py.html
@@ -152,7 +152,7 @@ <h1>queue_browser.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h1>queue_browser.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/recurring_timer.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/recurring_timer.py.html
index c5d963b1bb..2570ac709e 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/recurring_timer.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/recurring_timer.py.html
@@ -152,7 +152,7 @@ <h1>recurring_timer.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h1>recurring_timer.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/recurring_timer_tornado.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/recurring_timer_tornado.py.html
index d9a6bb63fc..9f57013dda 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/recurring_timer_tornado.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/recurring_timer_tornado.py.html
@@ -153,7 +153,7 @@ <h1>recurring_timer_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -161,7 +161,7 @@ <h1>recurring_timer_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/selected_recv.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/selected_recv.py.html
index 62785a6fb4..56a88edb1f 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/selected_recv.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/selected_recv.py.html
@@ -166,7 +166,7 @@ <h1>selected_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h1>selected_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/server.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/server.py.html
index 37083b9a27..32ef024af1 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/server.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/server.py.html
@@ -166,7 +166,7 @@ <h1>server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h1>server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/server_direct.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/server_direct.py.html
index 8a06e839bf..c1da332e58 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/server_direct.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/server_direct.py.html
@@ -174,7 +174,7 @@ <h1>server_direct.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h1>server_direct.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/server_tx.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/server_tx.py.html
index 6e40face75..33bf3fbf18 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/server_tx.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/server_tx.py.html
@@ -188,7 +188,7 @@ <h1>server_tx.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -196,7 +196,7 @@ <h1>server_tx.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/simple_recv.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/simple_recv.py.html
index c0d6193fff..7296998282 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/simple_recv.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/simple_recv.py.html
@@ -168,7 +168,7 @@ <h1>simple_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h1>simple_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/simple_send.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/simple_send.py.html
index 917d28739a..befc96646e 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/simple_send.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/simple_send.py.html
@@ -175,7 +175,7 @@ <h1>simple_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h1>simple_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/sync_client.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/sync_client.py.html
index fc5c689463..91d2f6acc2 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/sync_client.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/sync_client.py.html
@@ -160,7 +160,7 @@ <h1>sync_client.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h1>sync_client.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/test_examples.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/test_examples.py.html
index be0215d10e..7464c9dbdd 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/test_examples.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/test_examples.py.html
@@ -283,7 +283,7 @@ <h1>test_examples.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -291,7 +291,7 @@ <h1>test_examples.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_recv.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_recv.py.html
index 886ee8d359..f8da6febd9 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_recv.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_recv.py.html
@@ -189,7 +189,7 @@ <h1>tx_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>tx_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_recv_interactive.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_recv_interactive.py.html
index 0c2c8cb113..103cafd314 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_recv_interactive.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_recv_interactive.py.html
@@ -195,7 +195,7 @@ <h1>tx_recv_interactive.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -203,7 +203,7 @@ <h1>tx_recv_interactive.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_send.py.html b/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_send.py.html
index 726f2ac8a1..598928e913 100644
--- a/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_send.py.html
+++ b/content/releases/qpid-proton-0.37.0/proton/python/examples/tx_send.py.html
@@ -201,7 +201,7 @@ <h1>tx_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -209,7 +209,7 @@ <h1>tx_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/broker.rb.html b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/broker.rb.html
index ba5610a6e9..efb65387fc 100644
--- a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/broker.rb.html
+++ b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/broker.rb.html
@@ -285,7 +285,7 @@ <h1>broker.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -293,7 +293,7 @@ <h1>broker.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/client.rb.html b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/client.rb.html
index 39f1f718c6..457ec49ac6 100644
--- a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/client.rb.html
+++ b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/client.rb.html
@@ -190,7 +190,7 @@ <h1>client.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -198,7 +198,7 @@ <h1>client.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/direct_recv.rb.html b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/direct_recv.rb.html
index 5874d05dff..b16b0aea59 100644
--- a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/direct_recv.rb.html
+++ b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/direct_recv.rb.html
@@ -171,7 +171,7 @@ <h1>direct_recv.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -179,7 +179,7 @@ <h1>direct_recv.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/direct_send.rb.html b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/direct_send.rb.html
index a0a36502b4..88d217f857 100644
--- a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/direct_send.rb.html
+++ b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/direct_send.rb.html
@@ -178,7 +178,7 @@ <h1>direct_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1>direct_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/helloworld.rb.html b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/helloworld.rb.html
index 87a9426e18..59f4441c20 100644
--- a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/helloworld.rb.html
+++ b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/helloworld.rb.html
@@ -168,7 +168,7 @@ <h1>helloworld.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h1>helloworld.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/index.html b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/index.html
index fd9e8f41f6..431d757453 100644
--- a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/index.html
+++ b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/index.html
@@ -147,7 +147,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/server.rb.html b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/server.rb.html
index c743a8b0a4..b80353d5ad 100644
--- a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/server.rb.html
+++ b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/server.rb.html
@@ -181,7 +181,7 @@ <h1>server.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -189,7 +189,7 @@ <h1>server.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/simple_recv.rb.html b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/simple_recv.rb.html
index a348e700cd..8ad6aff776 100644
--- a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/simple_recv.rb.html
+++ b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/simple_recv.rb.html
@@ -167,7 +167,7 @@ <h1>simple_recv.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h1>simple_recv.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/simple_send.rb.html b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/simple_send.rb.html
index 55528d601b..07ea279945 100644
--- a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/simple_send.rb.html
+++ b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/simple_send.rb.html
@@ -174,7 +174,7 @@ <h1>simple_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h1>simple_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/ssl_send.rb.html b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/ssl_send.rb.html
index a187126fa4..489af7e27d 100644
--- a/content/releases/qpid-proton-0.37.0/proton/ruby/examples/ssl_send.rb.html
+++ b/content/releases/qpid-proton-0.37.0/proton/ruby/examples/ssl_send.rb.html
@@ -182,7 +182,7 @@ <h1>ssl_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h1>ssl_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.37.0/release-notes.html b/content/releases/qpid-proton-0.37.0/release-notes.html
index 51c8184bd2..60113d2f33 100644
--- a/content/releases/qpid-proton-0.37.0/release-notes.html
+++ b/content/releases/qpid-proton-0.37.0/release-notes.html
@@ -173,7 +173,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -181,7 +181,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/index.html b/content/releases/qpid-proton-0.38.0/index.html
index d00de1bf6e..ef78b97491 100644
--- a/content/releases/qpid-proton-0.38.0/index.html
+++ b/content/releases/qpid-proton-0.38.0/index.html
@@ -192,7 +192,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -200,7 +200,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/broker.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/broker.cpp.html
index ec9b147d46..d6f6ee3875 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/broker.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/broker.cpp.html
@@ -538,7 +538,7 @@ <h1>broker.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -546,7 +546,7 @@ <h1>broker.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/client.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/client.cpp.html
index 26f89b12f1..40ac3e8f44 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/client.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/client.cpp.html
@@ -217,7 +217,7 @@ <h1>client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -225,7 +225,7 @@ <h1>client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/colour_send.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/colour_send.cpp.html
index 4f18ca241a..0368a500ef 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/colour_send.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/colour_send.cpp.html
@@ -224,7 +224,7 @@ <h1>colour_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -232,7 +232,7 @@ <h1>colour_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/connection_options.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/connection_options.cpp.html
index edc993ef00..c403d2036a 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/connection_options.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/connection_options.cpp.html
@@ -184,7 +184,7 @@ <h1>connection_options.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h1>connection_options.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/direct_recv.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/direct_recv.cpp.html
index cf433e28c7..b625f7ef8d 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/direct_recv.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/direct_recv.cpp.html
@@ -209,7 +209,7 @@ <h1>direct_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -217,7 +217,7 @@ <h1>direct_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/direct_send.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/direct_send.cpp.html
index 56a4ff06f4..e2f2e26178 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/direct_send.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/direct_send.cpp.html
@@ -220,7 +220,7 @@ <h1>direct_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -228,7 +228,7 @@ <h1>direct_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/encode_decode.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/encode_decode.cpp.html
index 4672bccd3b..121cbf9bce 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/encode_decode.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/encode_decode.cpp.html
@@ -362,7 +362,7 @@ <h1>encode_decode.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -370,7 +370,7 @@ <h1>encode_decode.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/flow_control.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/flow_control.cpp.html
index b6cc4b3e58..8e26437a77 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/flow_control.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/flow_control.cpp.html
@@ -369,7 +369,7 @@ <h1>flow_control.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -377,7 +377,7 @@ <h1>flow_control.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/helloworld.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/helloworld.cpp.html
index 7cfb693630..89f2256934 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/helloworld.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/helloworld.cpp.html
@@ -184,7 +184,7 @@ <h1>helloworld.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h1>helloworld.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/index.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/index.html
index 309dee400f..41a59e40e3 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/index.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/index.html
@@ -166,7 +166,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/message_properties.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/message_properties.cpp.html
index 203773672c..1c890c9e82 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/message_properties.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/message_properties.cpp.html
@@ -212,7 +212,7 @@ <h1>message_properties.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -220,7 +220,7 @@ <h1>message_properties.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/multithreaded_client.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/multithreaded_client.cpp.html
index e6efdca8c6..d957b6bdd8 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/multithreaded_client.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/multithreaded_client.cpp.html
@@ -296,7 +296,7 @@ <h1>multithreaded_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -304,7 +304,7 @@ <h1>multithreaded_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
index d69fbe49b5..ee13a7aaa8 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
@@ -427,7 +427,7 @@ <h1>multithreaded_client_flow_control.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -435,7 +435,7 @@ <h1>multithreaded_client_flow_control.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/options.hpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/options.hpp.html
index c9399b605c..93ee78c0d3 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/options.hpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/options.hpp.html
@@ -286,7 +286,7 @@ <h1>options.hpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -294,7 +294,7 @@ <h1>options.hpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/queue_browser.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/queue_browser.cpp.html
index 39059a0cb2..450756ce25 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/queue_browser.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/queue_browser.cpp.html
@@ -178,7 +178,7 @@ <h1>queue_browser.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1>queue_browser.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/reconnect_client.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/reconnect_client.cpp.html
index 940fc34d0e..a4b63ee751 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/reconnect_client.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/reconnect_client.cpp.html
@@ -249,7 +249,7 @@ <h1>reconnect_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -257,7 +257,7 @@ <h1>reconnect_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/scheduled_send.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/scheduled_send.cpp.html
index 0299ba3d97..14748e0063 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/scheduled_send.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/scheduled_send.cpp.html
@@ -229,7 +229,7 @@ <h1>scheduled_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -237,7 +237,7 @@ <h1>scheduled_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/scheduled_send_03.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/scheduled_send_03.cpp.html
index 330f99664e..dd90111908 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/scheduled_send_03.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/scheduled_send_03.cpp.html
@@ -226,7 +226,7 @@ <h1>scheduled_send_03.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>scheduled_send_03.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/selected_recv.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/selected_recv.cpp.html
index c99f5e0e91..239b477b97 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/selected_recv.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/selected_recv.cpp.html
@@ -198,7 +198,7 @@ <h1>selected_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -206,7 +206,7 @@ <h1>selected_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/server.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/server.cpp.html
index 038666f54b..d8931a8f7f 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/server.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/server.cpp.html
@@ -203,7 +203,7 @@ <h1>server.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -211,7 +211,7 @@ <h1>server.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/server_direct.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/server_direct.cpp.html
index 78b99a7c6a..e7e2db8515 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/server_direct.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/server_direct.cpp.html
@@ -238,7 +238,7 @@ <h1>server_direct.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -246,7 +246,7 @@ <h1>server_direct.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/service_bus.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/service_bus.cpp.html
index ddfa6a219d..475b9a8304 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/service_bus.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/service_bus.cpp.html
@@ -379,7 +379,7 @@ <h1>service_bus.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -387,7 +387,7 @@ <h1>service_bus.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_connect.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_connect.cpp.html
index 164197c057..1e8b8aa442 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_connect.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_connect.cpp.html
@@ -215,7 +215,7 @@ <h1>simple_connect.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -223,7 +223,7 @@ <h1>simple_connect.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_recv.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_recv.cpp.html
index 95c73227f1..f2aaf19860 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_recv.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_recv.cpp.html
@@ -211,7 +211,7 @@ <h1>simple_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -219,7 +219,7 @@ <h1>simple_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_send.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_send.cpp.html
index 597c5a8639..eaef8a398b 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_send.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/simple_send.cpp.html
@@ -232,7 +232,7 @@ <h1>simple_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -240,7 +240,7 @@ <h1>simple_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/ssl.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/ssl.cpp.html
index e7431870b7..8c2163a012 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/ssl.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/ssl.cpp.html
@@ -345,7 +345,7 @@ <h1>ssl.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -353,7 +353,7 @@ <h1>ssl.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/ssl_client_cert.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/ssl_client_cert.cpp.html
index bcf925371d..cc10ac29a9 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/ssl_client_cert.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/ssl_client_cert.cpp.html
@@ -311,7 +311,7 @@ <h1>ssl_client_cert.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -319,7 +319,7 @@ <h1>ssl_client_cert.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/tracing_client.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/tracing_client.cpp.html
index ba1446095d..744b44d346 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/tracing_client.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/tracing_client.cpp.html
@@ -303,7 +303,7 @@ <h1>tracing_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -311,7 +311,7 @@ <h1>tracing_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/tracing_server.cpp.html b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/tracing_server.cpp.html
index 7d77c4c4b5..433b181d4d 100644
--- a/content/releases/qpid-proton-0.38.0/proton/cpp/examples/tracing_server.cpp.html
+++ b/content/releases/qpid-proton-0.38.0/proton/cpp/examples/tracing_server.cpp.html
@@ -257,7 +257,7 @@ <h1>tracing_server.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -265,7 +265,7 @@ <h1>tracing_server.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/abstract_server.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/abstract_server.py.html
index ab9e698307..94ca1cdaa3 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/abstract_server.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/abstract_server.py.html
@@ -147,7 +147,7 @@ <h1>abstract_server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h1>abstract_server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/broker.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/broker.py.html
index 66837cc2e0..0f62234fd5 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/broker.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/broker.py.html
@@ -253,7 +253,7 @@ <h1>broker.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -261,7 +261,7 @@ <h1>broker.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/client.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/client.py.html
index ea72cffe92..7ceb43fa70 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/client.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/client.py.html
@@ -175,7 +175,7 @@ <h1>client.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h1>client.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/client_http.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/client_http.py.html
index 734c2a79be..e160047b77 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/client_http.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/client_http.py.html
@@ -226,7 +226,7 @@ <h1>client_http.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>client_http.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/colour_send.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/colour_send.py.html
index 7d665c1e8e..0f169bb3b9 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/colour_send.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/colour_send.py.html
@@ -180,7 +180,7 @@ <h1>colour_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -188,7 +188,7 @@ <h1>colour_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/db_common.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/db_common.py.html
index 5b1e305d30..80fe303d1e 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/db_common.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/db_common.py.html
@@ -226,7 +226,7 @@ <h1>db_common.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>db_common.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/db_ctrl.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/db_ctrl.py.html
index e09085bd6d..7ff46f221e 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/db_ctrl.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/db_ctrl.py.html
@@ -157,7 +157,7 @@ <h1>db_ctrl.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h1>db_ctrl.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/db_recv.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/db_recv.py.html
index fdb30823c5..1761552950 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/db_recv.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/db_recv.py.html
@@ -189,7 +189,7 @@ <h1>db_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>db_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/db_send.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/db_send.py.html
index 2536aa6fa8..3490781042 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/db_send.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/db_send.py.html
@@ -220,7 +220,7 @@ <h1>db_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -228,7 +228,7 @@ <h1>db_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/direct_recv.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/direct_recv.py.html
index 595489a214..c151c8b44f 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/direct_recv.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/direct_recv.py.html
@@ -169,7 +169,7 @@ <h1>direct_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -177,7 +177,7 @@ <h1>direct_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/direct_send.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/direct_send.py.html
index 396e7d1a66..3cdd476a05 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/direct_send.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/direct_send.py.html
@@ -176,7 +176,7 @@ <h1>direct_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h1>direct_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld.py.html
index 53dcad55f4..ed3512b1ed 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld.py.html
@@ -156,7 +156,7 @@ <h1>helloworld.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h1>helloworld.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_blocking.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_blocking.py.html
index d7f40723b7..781dd07de3 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_blocking.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_blocking.py.html
@@ -141,7 +141,7 @@ <h1>helloworld_blocking.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h1>helloworld_blocking.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_direct.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_direct.py.html
index a22dd0e018..a9331b9ba9 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_direct.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_direct.py.html
@@ -159,7 +159,7 @@ <h1>helloworld_direct.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h1>helloworld_direct.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_direct_tornado.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_direct_tornado.py.html
index 2744757c3b..d960f8ac54 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_direct_tornado.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_direct_tornado.py.html
@@ -159,7 +159,7 @@ <h1>helloworld_direct_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h1>helloworld_direct_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_tornado.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_tornado.py.html
index a5d36314a2..27b77aa00b 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_tornado.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/helloworld_tornado.py.html
@@ -156,7 +156,7 @@ <h1>helloworld_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h1>helloworld_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/index.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/index.html
index 2a02ff55d5..55036ee40d 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/index.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/index.html
@@ -170,7 +170,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/proton_server.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/proton_server.py.html
index ed9faa3305..9473558a27 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/proton_server.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/proton_server.py.html
@@ -162,7 +162,7 @@ <h1>proton_server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -170,7 +170,7 @@ <h1>proton_server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/proton_tornado.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/proton_tornado.py.html
index 478ac63ebf..1364765474 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/proton_tornado.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/proton_tornado.py.html
@@ -233,7 +233,7 @@ <h1>proton_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -241,7 +241,7 @@ <h1>proton_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/queue_browser.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/queue_browser.py.html
index d3e5eebc61..9671dc5bc6 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/queue_browser.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/queue_browser.py.html
@@ -152,7 +152,7 @@ <h1>queue_browser.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h1>queue_browser.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/recurring_timer.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/recurring_timer.py.html
index 2533ad11a3..f2e617cbe6 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/recurring_timer.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/recurring_timer.py.html
@@ -152,7 +152,7 @@ <h1>recurring_timer.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h1>recurring_timer.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/recurring_timer_tornado.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/recurring_timer_tornado.py.html
index 7cb865d42d..28315d320a 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/recurring_timer_tornado.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/recurring_timer_tornado.py.html
@@ -153,7 +153,7 @@ <h1>recurring_timer_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -161,7 +161,7 @@ <h1>recurring_timer_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/selected_recv.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/selected_recv.py.html
index 6a2286732f..0da4628d48 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/selected_recv.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/selected_recv.py.html
@@ -166,7 +166,7 @@ <h1>selected_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h1>selected_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/server.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/server.py.html
index c048c12192..685f4e2bfe 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/server.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/server.py.html
@@ -166,7 +166,7 @@ <h1>server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h1>server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/server_direct.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/server_direct.py.html
index 86720752eb..c3b534c24d 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/server_direct.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/server_direct.py.html
@@ -174,7 +174,7 @@ <h1>server_direct.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h1>server_direct.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/server_tx.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/server_tx.py.html
index 4f23cb8dbe..14340ab8a2 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/server_tx.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/server_tx.py.html
@@ -188,7 +188,7 @@ <h1>server_tx.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -196,7 +196,7 @@ <h1>server_tx.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/simple_recv.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/simple_recv.py.html
index d0dba6e7e1..80e7312360 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/simple_recv.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/simple_recv.py.html
@@ -168,7 +168,7 @@ <h1>simple_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h1>simple_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/simple_send.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/simple_send.py.html
index 0c1cfbe6b2..645acc6049 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/simple_send.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/simple_send.py.html
@@ -175,7 +175,7 @@ <h1>simple_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h1>simple_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/sync_client.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/sync_client.py.html
index d2fd594bd7..3b04367120 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/sync_client.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/sync_client.py.html
@@ -160,7 +160,7 @@ <h1>sync_client.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h1>sync_client.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/test_examples.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/test_examples.py.html
index 949acb2841..98755a2f74 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/test_examples.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/test_examples.py.html
@@ -283,7 +283,7 @@ <h1>test_examples.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -291,7 +291,7 @@ <h1>test_examples.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_recv.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_recv.py.html
index b50119a4a8..fea838cf78 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_recv.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_recv.py.html
@@ -189,7 +189,7 @@ <h1>tx_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>tx_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_recv_interactive.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_recv_interactive.py.html
index 9a231e5ea6..ac258545a4 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_recv_interactive.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_recv_interactive.py.html
@@ -195,7 +195,7 @@ <h1>tx_recv_interactive.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -203,7 +203,7 @@ <h1>tx_recv_interactive.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_send.py.html b/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_send.py.html
index c072de78aa..ca0a3ed3f1 100644
--- a/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_send.py.html
+++ b/content/releases/qpid-proton-0.38.0/proton/python/examples/tx_send.py.html
@@ -201,7 +201,7 @@ <h1>tx_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -209,7 +209,7 @@ <h1>tx_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/broker.rb.html b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/broker.rb.html
index 0022963ce1..29c1e969ca 100644
--- a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/broker.rb.html
+++ b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/broker.rb.html
@@ -285,7 +285,7 @@ <h1>broker.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -293,7 +293,7 @@ <h1>broker.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/client.rb.html b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/client.rb.html
index 23b0f49200..fd1d45a7c3 100644
--- a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/client.rb.html
+++ b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/client.rb.html
@@ -190,7 +190,7 @@ <h1>client.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -198,7 +198,7 @@ <h1>client.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/direct_recv.rb.html b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/direct_recv.rb.html
index 914a094b23..5cf12ca312 100644
--- a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/direct_recv.rb.html
+++ b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/direct_recv.rb.html
@@ -171,7 +171,7 @@ <h1>direct_recv.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -179,7 +179,7 @@ <h1>direct_recv.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/direct_send.rb.html b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/direct_send.rb.html
index 15b0a775c3..dfb94408c2 100644
--- a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/direct_send.rb.html
+++ b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/direct_send.rb.html
@@ -178,7 +178,7 @@ <h1>direct_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1>direct_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/helloworld.rb.html b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/helloworld.rb.html
index a6558cc508..b2c27b40b7 100644
--- a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/helloworld.rb.html
+++ b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/helloworld.rb.html
@@ -168,7 +168,7 @@ <h1>helloworld.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h1>helloworld.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/index.html b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/index.html
index 63d58f2263..f31d91bf9f 100644
--- a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/index.html
+++ b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/index.html
@@ -147,7 +147,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/server.rb.html b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/server.rb.html
index e34b67b2c2..b086c84392 100644
--- a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/server.rb.html
+++ b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/server.rb.html
@@ -181,7 +181,7 @@ <h1>server.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -189,7 +189,7 @@ <h1>server.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/simple_recv.rb.html b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/simple_recv.rb.html
index 3ea89a0bdd..402a125496 100644
--- a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/simple_recv.rb.html
+++ b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/simple_recv.rb.html
@@ -167,7 +167,7 @@ <h1>simple_recv.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h1>simple_recv.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/simple_send.rb.html b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/simple_send.rb.html
index d1e7372bbf..59b492d445 100644
--- a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/simple_send.rb.html
+++ b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/simple_send.rb.html
@@ -174,7 +174,7 @@ <h1>simple_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h1>simple_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/ssl_send.rb.html b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/ssl_send.rb.html
index 6d6cc2f1e4..314f84a0ee 100644
--- a/content/releases/qpid-proton-0.38.0/proton/ruby/examples/ssl_send.rb.html
+++ b/content/releases/qpid-proton-0.38.0/proton/ruby/examples/ssl_send.rb.html
@@ -182,7 +182,7 @@ <h1>ssl_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h1>ssl_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.38.0/release-notes.html b/content/releases/qpid-proton-0.38.0/release-notes.html
index 6774f6f6b2..9e4d6a924a 100644
--- a/content/releases/qpid-proton-0.38.0/release-notes.html
+++ b/content/releases/qpid-proton-0.38.0/release-notes.html
@@ -182,7 +182,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/index.html b/content/releases/qpid-proton-0.39.0/index.html
index 1321166f6f..559ac375be 100644
--- a/content/releases/qpid-proton-0.39.0/index.html
+++ b/content/releases/qpid-proton-0.39.0/index.html
@@ -192,7 +192,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -200,7 +200,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/broker.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/broker.cpp.html
index 43727351c0..999439aa24 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/broker.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/broker.cpp.html
@@ -579,7 +579,7 @@ <h1>broker.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -587,7 +587,7 @@ <h1>broker.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/client.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/client.cpp.html
index 0323f8f39a..41bfdf8682 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/client.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/client.cpp.html
@@ -217,7 +217,7 @@ <h1>client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -225,7 +225,7 @@ <h1>client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/colour_send.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/colour_send.cpp.html
index 5559f362bc..28ac18bba0 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/colour_send.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/colour_send.cpp.html
@@ -224,7 +224,7 @@ <h1>colour_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -232,7 +232,7 @@ <h1>colour_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/connection_options.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/connection_options.cpp.html
index d3478235e3..2a10536b1e 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/connection_options.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/connection_options.cpp.html
@@ -184,7 +184,7 @@ <h1>connection_options.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h1>connection_options.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/direct_recv.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/direct_recv.cpp.html
index 9133f7c3ae..1f87017691 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/direct_recv.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/direct_recv.cpp.html
@@ -209,7 +209,7 @@ <h1>direct_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -217,7 +217,7 @@ <h1>direct_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/direct_send.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/direct_send.cpp.html
index 0f10c0c649..bfee767e7d 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/direct_send.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/direct_send.cpp.html
@@ -220,7 +220,7 @@ <h1>direct_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -228,7 +228,7 @@ <h1>direct_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/encode_decode.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/encode_decode.cpp.html
index 6be7779517..233a2349a5 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/encode_decode.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/encode_decode.cpp.html
@@ -362,7 +362,7 @@ <h1>encode_decode.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -370,7 +370,7 @@ <h1>encode_decode.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/flow_control.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/flow_control.cpp.html
index 42a80f6bfa..20b70fab2f 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/flow_control.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/flow_control.cpp.html
@@ -369,7 +369,7 @@ <h1>flow_control.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -377,7 +377,7 @@ <h1>flow_control.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/helloworld.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/helloworld.cpp.html
index de3fd44b4c..27f62e72ab 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/helloworld.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/helloworld.cpp.html
@@ -184,7 +184,7 @@ <h1>helloworld.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h1>helloworld.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/index.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/index.html
index 63224c5ff4..3e0dc12dba 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/index.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/index.html
@@ -166,7 +166,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/message_properties.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/message_properties.cpp.html
index a0ab77b6ae..1019677355 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/message_properties.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/message_properties.cpp.html
@@ -212,7 +212,7 @@ <h1>message_properties.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -220,7 +220,7 @@ <h1>message_properties.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/multithreaded_client.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/multithreaded_client.cpp.html
index 7863639a04..ea2d11fa8d 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/multithreaded_client.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/multithreaded_client.cpp.html
@@ -296,7 +296,7 @@ <h1>multithreaded_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -304,7 +304,7 @@ <h1>multithreaded_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
index 90c7f2806c..a00ea788c7 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
@@ -427,7 +427,7 @@ <h1>multithreaded_client_flow_control.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -435,7 +435,7 @@ <h1>multithreaded_client_flow_control.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/options.hpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/options.hpp.html
index 50c1600834..a443da30f0 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/options.hpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/options.hpp.html
@@ -286,7 +286,7 @@ <h1>options.hpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -294,7 +294,7 @@ <h1>options.hpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/queue_browser.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/queue_browser.cpp.html
index fa0081a547..db2264e2c3 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/queue_browser.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/queue_browser.cpp.html
@@ -178,7 +178,7 @@ <h1>queue_browser.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1>queue_browser.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/reconnect_client.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/reconnect_client.cpp.html
index 3aa86c4182..0e5f0bfc0f 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/reconnect_client.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/reconnect_client.cpp.html
@@ -249,7 +249,7 @@ <h1>reconnect_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -257,7 +257,7 @@ <h1>reconnect_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/scheduled_send.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/scheduled_send.cpp.html
index 7c34ebc48b..680576dac2 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/scheduled_send.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/scheduled_send.cpp.html
@@ -229,7 +229,7 @@ <h1>scheduled_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -237,7 +237,7 @@ <h1>scheduled_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/scheduled_send_03.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/scheduled_send_03.cpp.html
index ee9bdbcaec..be8b1970fc 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/scheduled_send_03.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/scheduled_send_03.cpp.html
@@ -226,7 +226,7 @@ <h1>scheduled_send_03.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>scheduled_send_03.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/selected_recv.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/selected_recv.cpp.html
index 471f1eb73f..27317c3b22 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/selected_recv.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/selected_recv.cpp.html
@@ -198,7 +198,7 @@ <h1>selected_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -206,7 +206,7 @@ <h1>selected_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/server.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/server.cpp.html
index 52ed16a8da..e53218e797 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/server.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/server.cpp.html
@@ -203,7 +203,7 @@ <h1>server.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -211,7 +211,7 @@ <h1>server.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/server_direct.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/server_direct.cpp.html
index 0afd1d9f03..5efff70792 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/server_direct.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/server_direct.cpp.html
@@ -238,7 +238,7 @@ <h1>server_direct.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -246,7 +246,7 @@ <h1>server_direct.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/service_bus.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/service_bus.cpp.html
index c07c5204c0..e4fb5c6833 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/service_bus.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/service_bus.cpp.html
@@ -379,7 +379,7 @@ <h1>service_bus.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -387,7 +387,7 @@ <h1>service_bus.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_connect.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_connect.cpp.html
index afae7ee510..a544c84bab 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_connect.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_connect.cpp.html
@@ -215,7 +215,7 @@ <h1>simple_connect.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -223,7 +223,7 @@ <h1>simple_connect.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_recv.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_recv.cpp.html
index a228b49c7f..f89ac2427c 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_recv.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_recv.cpp.html
@@ -211,7 +211,7 @@ <h1>simple_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -219,7 +219,7 @@ <h1>simple_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_send.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_send.cpp.html
index 51d85ef5cb..6067401fd3 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_send.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/simple_send.cpp.html
@@ -232,7 +232,7 @@ <h1>simple_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -240,7 +240,7 @@ <h1>simple_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/ssl.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/ssl.cpp.html
index 3e91c0ff0f..e4aafb4706 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/ssl.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/ssl.cpp.html
@@ -345,7 +345,7 @@ <h1>ssl.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -353,7 +353,7 @@ <h1>ssl.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/ssl_client_cert.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/ssl_client_cert.cpp.html
index e59697b385..2853bd8901 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/ssl_client_cert.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/ssl_client_cert.cpp.html
@@ -311,7 +311,7 @@ <h1>ssl_client_cert.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -319,7 +319,7 @@ <h1>ssl_client_cert.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/tracing_client.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/tracing_client.cpp.html
index f53e0a0c90..4820e39a08 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/tracing_client.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/tracing_client.cpp.html
@@ -301,7 +301,7 @@ <h1>tracing_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -309,7 +309,7 @@ <h1>tracing_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/tracing_server.cpp.html b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/tracing_server.cpp.html
index 4abc8352da..b1f3ab5061 100644
--- a/content/releases/qpid-proton-0.39.0/proton/cpp/examples/tracing_server.cpp.html
+++ b/content/releases/qpid-proton-0.39.0/proton/cpp/examples/tracing_server.cpp.html
@@ -258,7 +258,7 @@ <h1>tracing_server.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -266,7 +266,7 @@ <h1>tracing_server.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/abstract_server.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/abstract_server.py.html
index 2eb020a011..4d12e6f8a2 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/abstract_server.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/abstract_server.py.html
@@ -147,7 +147,7 @@ <h1>abstract_server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h1>abstract_server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/broker.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/broker.py.html
index 0926e8bf3c..e0f69c2893 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/broker.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/broker.py.html
@@ -253,7 +253,7 @@ <h1>broker.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -261,7 +261,7 @@ <h1>broker.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/client.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/client.py.html
index a4d8678278..f17371288f 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/client.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/client.py.html
@@ -175,7 +175,7 @@ <h1>client.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h1>client.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/client_http.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/client_http.py.html
index a02d5106c9..8faf00fbe8 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/client_http.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/client_http.py.html
@@ -226,7 +226,7 @@ <h1>client_http.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>client_http.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/colour_send.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/colour_send.py.html
index 3a204e5cb9..6e1eb98790 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/colour_send.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/colour_send.py.html
@@ -180,7 +180,7 @@ <h1>colour_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -188,7 +188,7 @@ <h1>colour_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/db_common.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/db_common.py.html
index 3ef70ca27b..7dfb119215 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/db_common.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/db_common.py.html
@@ -226,7 +226,7 @@ <h1>db_common.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>db_common.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/db_ctrl.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/db_ctrl.py.html
index 6a8cf3b96e..fdf9d64ec7 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/db_ctrl.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/db_ctrl.py.html
@@ -157,7 +157,7 @@ <h1>db_ctrl.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h1>db_ctrl.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/db_recv.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/db_recv.py.html
index 489355e2b0..f272e78445 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/db_recv.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/db_recv.py.html
@@ -189,7 +189,7 @@ <h1>db_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>db_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/db_send.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/db_send.py.html
index 56ebc032c6..b3222e07e1 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/db_send.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/db_send.py.html
@@ -220,7 +220,7 @@ <h1>db_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -228,7 +228,7 @@ <h1>db_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/direct_recv.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/direct_recv.py.html
index 9e9c484bc4..723f6a1ee1 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/direct_recv.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/direct_recv.py.html
@@ -169,7 +169,7 @@ <h1>direct_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -177,7 +177,7 @@ <h1>direct_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/direct_send.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/direct_send.py.html
index 20a31d6fc3..9f3709c900 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/direct_send.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/direct_send.py.html
@@ -176,7 +176,7 @@ <h1>direct_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h1>direct_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld.py.html
index 486b8e6344..f18314a3c1 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld.py.html
@@ -156,7 +156,7 @@ <h1>helloworld.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h1>helloworld.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_blocking.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_blocking.py.html
index d1eda60238..ce24e00c7a 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_blocking.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_blocking.py.html
@@ -141,7 +141,7 @@ <h1>helloworld_blocking.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h1>helloworld_blocking.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_direct.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_direct.py.html
index 9148e58800..14c2394cd2 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_direct.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_direct.py.html
@@ -159,7 +159,7 @@ <h1>helloworld_direct.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h1>helloworld_direct.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_direct_tornado.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_direct_tornado.py.html
index 9370771477..7c2e70457a 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_direct_tornado.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_direct_tornado.py.html
@@ -159,7 +159,7 @@ <h1>helloworld_direct_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h1>helloworld_direct_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_tornado.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_tornado.py.html
index 1761e17dec..f258876b41 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_tornado.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/helloworld_tornado.py.html
@@ -156,7 +156,7 @@ <h1>helloworld_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h1>helloworld_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/index.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/index.html
index 2e323d07b9..98ae67ece4 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/index.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/index.html
@@ -170,7 +170,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/proton_server.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/proton_server.py.html
index f815db4a0f..12f83dafc6 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/proton_server.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/proton_server.py.html
@@ -162,7 +162,7 @@ <h1>proton_server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -170,7 +170,7 @@ <h1>proton_server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/proton_tornado.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/proton_tornado.py.html
index 90b5db813c..7c435006a6 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/proton_tornado.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/proton_tornado.py.html
@@ -233,7 +233,7 @@ <h1>proton_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -241,7 +241,7 @@ <h1>proton_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/queue_browser.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/queue_browser.py.html
index afa4210730..fe04f72139 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/queue_browser.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/queue_browser.py.html
@@ -152,7 +152,7 @@ <h1>queue_browser.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h1>queue_browser.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/recurring_timer.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/recurring_timer.py.html
index 58e8e6beae..e853301ac8 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/recurring_timer.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/recurring_timer.py.html
@@ -152,7 +152,7 @@ <h1>recurring_timer.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h1>recurring_timer.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/recurring_timer_tornado.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/recurring_timer_tornado.py.html
index c17d909efb..6d0618d523 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/recurring_timer_tornado.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/recurring_timer_tornado.py.html
@@ -153,7 +153,7 @@ <h1>recurring_timer_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -161,7 +161,7 @@ <h1>recurring_timer_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/selected_recv.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/selected_recv.py.html
index 42fc591958..0fe5ac30e4 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/selected_recv.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/selected_recv.py.html
@@ -166,7 +166,7 @@ <h1>selected_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h1>selected_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/server.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/server.py.html
index 40f226dbf6..039784b990 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/server.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/server.py.html
@@ -181,7 +181,7 @@ <h1>server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -189,7 +189,7 @@ <h1>server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/server_direct.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/server_direct.py.html
index 0e892abacc..e79717c90a 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/server_direct.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/server_direct.py.html
@@ -174,7 +174,7 @@ <h1>server_direct.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h1>server_direct.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/server_tx.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/server_tx.py.html
index ce5155c497..2e10050dd4 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/server_tx.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/server_tx.py.html
@@ -188,7 +188,7 @@ <h1>server_tx.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -196,7 +196,7 @@ <h1>server_tx.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/simple_recv.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/simple_recv.py.html
index c78acd95c7..38207ecb91 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/simple_recv.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/simple_recv.py.html
@@ -168,7 +168,7 @@ <h1>simple_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h1>simple_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/simple_send.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/simple_send.py.html
index 5378346067..3a73d9eb83 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/simple_send.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/simple_send.py.html
@@ -175,7 +175,7 @@ <h1>simple_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h1>simple_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/sync_client.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/sync_client.py.html
index 38cef4b7dd..5d39b6e356 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/sync_client.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/sync_client.py.html
@@ -160,7 +160,7 @@ <h1>sync_client.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h1>sync_client.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/test_examples.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/test_examples.py.html
index ec7df9c19a..1710b08b49 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/test_examples.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/test_examples.py.html
@@ -283,7 +283,7 @@ <h1>test_examples.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -291,7 +291,7 @@ <h1>test_examples.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_recv.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_recv.py.html
index 0e583817e4..9a43e91ed6 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_recv.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_recv.py.html
@@ -189,7 +189,7 @@ <h1>tx_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>tx_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_recv_interactive.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_recv_interactive.py.html
index cf88467a14..e64996c20f 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_recv_interactive.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_recv_interactive.py.html
@@ -195,7 +195,7 @@ <h1>tx_recv_interactive.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -203,7 +203,7 @@ <h1>tx_recv_interactive.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_send.py.html b/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_send.py.html
index 25806f7d6a..64fb184be3 100644
--- a/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_send.py.html
+++ b/content/releases/qpid-proton-0.39.0/proton/python/examples/tx_send.py.html
@@ -201,7 +201,7 @@ <h1>tx_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -209,7 +209,7 @@ <h1>tx_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/broker.rb.html b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/broker.rb.html
index 6b02300d11..94c92ceff6 100644
--- a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/broker.rb.html
+++ b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/broker.rb.html
@@ -285,7 +285,7 @@ <h1>broker.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -293,7 +293,7 @@ <h1>broker.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/client.rb.html b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/client.rb.html
index 8a1d91df74..6b42ee00a3 100644
--- a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/client.rb.html
+++ b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/client.rb.html
@@ -190,7 +190,7 @@ <h1>client.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -198,7 +198,7 @@ <h1>client.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/direct_recv.rb.html b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/direct_recv.rb.html
index 1238c5ed14..e168c96f2e 100644
--- a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/direct_recv.rb.html
+++ b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/direct_recv.rb.html
@@ -171,7 +171,7 @@ <h1>direct_recv.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -179,7 +179,7 @@ <h1>direct_recv.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/direct_send.rb.html b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/direct_send.rb.html
index 127ef5f55c..a1e7a62a1c 100644
--- a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/direct_send.rb.html
+++ b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/direct_send.rb.html
@@ -178,7 +178,7 @@ <h1>direct_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1>direct_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/helloworld.rb.html b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/helloworld.rb.html
index eb746ae02b..6b68c41943 100644
--- a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/helloworld.rb.html
+++ b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/helloworld.rb.html
@@ -168,7 +168,7 @@ <h1>helloworld.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h1>helloworld.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/index.html b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/index.html
index ed14b0ab79..1ac4437e4f 100644
--- a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/index.html
+++ b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/index.html
@@ -147,7 +147,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/server.rb.html b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/server.rb.html
index 8ba24f7866..017f1b4f09 100644
--- a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/server.rb.html
+++ b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/server.rb.html
@@ -181,7 +181,7 @@ <h1>server.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -189,7 +189,7 @@ <h1>server.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/simple_recv.rb.html b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/simple_recv.rb.html
index 0138a2c3f5..b81d1f2964 100644
--- a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/simple_recv.rb.html
+++ b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/simple_recv.rb.html
@@ -167,7 +167,7 @@ <h1>simple_recv.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h1>simple_recv.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/simple_send.rb.html b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/simple_send.rb.html
index 6658148f87..a8a4e42c0d 100644
--- a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/simple_send.rb.html
+++ b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/simple_send.rb.html
@@ -174,7 +174,7 @@ <h1>simple_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h1>simple_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/ssl_send.rb.html b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/ssl_send.rb.html
index 898c58ad77..79af404eb8 100644
--- a/content/releases/qpid-proton-0.39.0/proton/ruby/examples/ssl_send.rb.html
+++ b/content/releases/qpid-proton-0.39.0/proton/ruby/examples/ssl_send.rb.html
@@ -182,7 +182,7 @@ <h1>ssl_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h1>ssl_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.39.0/release-notes.html b/content/releases/qpid-proton-0.39.0/release-notes.html
index f4819aa782..c83e561b2a 100644
--- a/content/releases/qpid-proton-0.39.0/release-notes.html
+++ b/content/releases/qpid-proton-0.39.0/release-notes.html
@@ -177,7 +177,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -185,7 +185,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/index.html b/content/releases/qpid-proton-0.40.0/index.html
index 81e8240b72..258605fa8b 100644
--- a/content/releases/qpid-proton-0.40.0/index.html
+++ b/content/releases/qpid-proton-0.40.0/index.html
@@ -192,7 +192,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -200,7 +200,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/broker.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/broker.cpp.html
index 17b352b401..882d3e9742 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/broker.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/broker.cpp.html
@@ -579,7 +579,7 @@ <h1>broker.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -587,7 +587,7 @@ <h1>broker.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/client.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/client.cpp.html
index 6d6cb0b95f..51c692804f 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/client.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/client.cpp.html
@@ -217,7 +217,7 @@ <h1>client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -225,7 +225,7 @@ <h1>client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/colour_send.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/colour_send.cpp.html
index f9571de48b..485d00e5ed 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/colour_send.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/colour_send.cpp.html
@@ -224,7 +224,7 @@ <h1>colour_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -232,7 +232,7 @@ <h1>colour_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/connection_options.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/connection_options.cpp.html
index 047be6e8ce..8d05c4de67 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/connection_options.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/connection_options.cpp.html
@@ -184,7 +184,7 @@ <h1>connection_options.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h1>connection_options.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/direct_recv.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/direct_recv.cpp.html
index 5f785809dd..65dd744b9e 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/direct_recv.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/direct_recv.cpp.html
@@ -209,7 +209,7 @@ <h1>direct_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -217,7 +217,7 @@ <h1>direct_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/direct_send.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/direct_send.cpp.html
index f5b162b878..28c2822570 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/direct_send.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/direct_send.cpp.html
@@ -220,7 +220,7 @@ <h1>direct_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -228,7 +228,7 @@ <h1>direct_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/encode_decode.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/encode_decode.cpp.html
index 35adbe4f0c..2514f2475b 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/encode_decode.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/encode_decode.cpp.html
@@ -362,7 +362,7 @@ <h1>encode_decode.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -370,7 +370,7 @@ <h1>encode_decode.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/flow_control.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/flow_control.cpp.html
index 026bc46bd5..68b9458027 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/flow_control.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/flow_control.cpp.html
@@ -369,7 +369,7 @@ <h1>flow_control.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -377,7 +377,7 @@ <h1>flow_control.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/helloworld.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/helloworld.cpp.html
index 68f02e67a3..d0d63d8659 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/helloworld.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/helloworld.cpp.html
@@ -184,7 +184,7 @@ <h1>helloworld.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -192,7 +192,7 @@ <h1>helloworld.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/index.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/index.html
index 15ece37199..82ba3faa57 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/index.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/index.html
@@ -166,7 +166,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/message_properties.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/message_properties.cpp.html
index 5e160ed9d7..3ae679f292 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/message_properties.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/message_properties.cpp.html
@@ -212,7 +212,7 @@ <h1>message_properties.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -220,7 +220,7 @@ <h1>message_properties.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/multithreaded_client.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/multithreaded_client.cpp.html
index 1d8c879bdc..81399bfc96 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/multithreaded_client.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/multithreaded_client.cpp.html
@@ -296,7 +296,7 @@ <h1>multithreaded_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -304,7 +304,7 @@ <h1>multithreaded_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
index 98d54dc588..1e8d24816b 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/multithreaded_client_flow_control.cpp.html
@@ -427,7 +427,7 @@ <h1>multithreaded_client_flow_control.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -435,7 +435,7 @@ <h1>multithreaded_client_flow_control.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/options.hpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/options.hpp.html
index ba38cd2811..1ac14d6221 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/options.hpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/options.hpp.html
@@ -286,7 +286,7 @@ <h1>options.hpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -294,7 +294,7 @@ <h1>options.hpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/queue_browser.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/queue_browser.cpp.html
index ff1872132f..ee08dc57d4 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/queue_browser.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/queue_browser.cpp.html
@@ -178,7 +178,7 @@ <h1>queue_browser.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1>queue_browser.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/reconnect_client.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/reconnect_client.cpp.html
index 959ad7c452..edca512056 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/reconnect_client.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/reconnect_client.cpp.html
@@ -249,7 +249,7 @@ <h1>reconnect_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -257,7 +257,7 @@ <h1>reconnect_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/scheduled_send.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/scheduled_send.cpp.html
index 8ba0681a4e..023d2dfdee 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/scheduled_send.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/scheduled_send.cpp.html
@@ -229,7 +229,7 @@ <h1>scheduled_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -237,7 +237,7 @@ <h1>scheduled_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/scheduled_send_03.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/scheduled_send_03.cpp.html
index 32f119febb..da65a6921b 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/scheduled_send_03.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/scheduled_send_03.cpp.html
@@ -226,7 +226,7 @@ <h1>scheduled_send_03.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>scheduled_send_03.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/selected_recv.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/selected_recv.cpp.html
index e7cb9a523c..2acbea3785 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/selected_recv.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/selected_recv.cpp.html
@@ -198,7 +198,7 @@ <h1>selected_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -206,7 +206,7 @@ <h1>selected_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/server.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/server.cpp.html
index 7be5e09791..ad38561764 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/server.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/server.cpp.html
@@ -203,7 +203,7 @@ <h1>server.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -211,7 +211,7 @@ <h1>server.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/server_direct.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/server_direct.cpp.html
index e9318d179d..13637dd93c 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/server_direct.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/server_direct.cpp.html
@@ -238,7 +238,7 @@ <h1>server_direct.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -246,7 +246,7 @@ <h1>server_direct.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/service_bus.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/service_bus.cpp.html
index f5240d1b66..6156ec9abf 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/service_bus.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/service_bus.cpp.html
@@ -379,7 +379,7 @@ <h1>service_bus.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -387,7 +387,7 @@ <h1>service_bus.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_connect.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_connect.cpp.html
index 6ed4c3cd2f..b8245c4032 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_connect.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_connect.cpp.html
@@ -215,7 +215,7 @@ <h1>simple_connect.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -223,7 +223,7 @@ <h1>simple_connect.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_recv.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_recv.cpp.html
index 2af63ff473..d8871c39f1 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_recv.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_recv.cpp.html
@@ -211,7 +211,7 @@ <h1>simple_recv.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -219,7 +219,7 @@ <h1>simple_recv.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_send.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_send.cpp.html
index a0f6d05bbb..daf4532c68 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_send.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/simple_send.cpp.html
@@ -232,7 +232,7 @@ <h1>simple_send.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -240,7 +240,7 @@ <h1>simple_send.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/ssl.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/ssl.cpp.html
index 1ee0ff5e1c..af6ba1937f 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/ssl.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/ssl.cpp.html
@@ -345,7 +345,7 @@ <h1>ssl.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -353,7 +353,7 @@ <h1>ssl.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/ssl_client_cert.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/ssl_client_cert.cpp.html
index 3aa8a54c8b..dd6988c418 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/ssl_client_cert.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/ssl_client_cert.cpp.html
@@ -311,7 +311,7 @@ <h1>ssl_client_cert.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -319,7 +319,7 @@ <h1>ssl_client_cert.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/tracing_client.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/tracing_client.cpp.html
index 2dae52ac57..13e702ef6c 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/tracing_client.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/tracing_client.cpp.html
@@ -301,7 +301,7 @@ <h1>tracing_client.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -309,7 +309,7 @@ <h1>tracing_client.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/tracing_server.cpp.html b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/tracing_server.cpp.html
index 660cb68df2..85719c1f7b 100644
--- a/content/releases/qpid-proton-0.40.0/proton/cpp/examples/tracing_server.cpp.html
+++ b/content/releases/qpid-proton-0.40.0/proton/cpp/examples/tracing_server.cpp.html
@@ -258,7 +258,7 @@ <h1>tracing_server.cpp</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -266,7 +266,7 @@ <h1>tracing_server.cpp</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/abstract_server.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/abstract_server.py.html
index 97d4b26642..48a465b663 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/abstract_server.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/abstract_server.py.html
@@ -147,7 +147,7 @@ <h1>abstract_server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h1>abstract_server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/broker.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/broker.py.html
index 4324c270d8..d44a999e09 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/broker.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/broker.py.html
@@ -256,7 +256,7 @@ <h1>broker.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -264,7 +264,7 @@ <h1>broker.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/client.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/client.py.html
index 9c705e5ac7..931fa6fc2d 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/client.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/client.py.html
@@ -175,7 +175,7 @@ <h1>client.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h1>client.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/client_http.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/client_http.py.html
index 50854eed38..08ec1f3307 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/client_http.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/client_http.py.html
@@ -226,7 +226,7 @@ <h1>client_http.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>client_http.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/colour_send.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/colour_send.py.html
index 42df23be92..22c36e00e5 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/colour_send.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/colour_send.py.html
@@ -180,7 +180,7 @@ <h1>colour_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -188,7 +188,7 @@ <h1>colour_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/db_common.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/db_common.py.html
index ca3020e5c8..1d8186a066 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/db_common.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/db_common.py.html
@@ -226,7 +226,7 @@ <h1>db_common.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -234,7 +234,7 @@ <h1>db_common.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/db_ctrl.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/db_ctrl.py.html
index 0c768ea08d..7f929ca828 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/db_ctrl.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/db_ctrl.py.html
@@ -157,7 +157,7 @@ <h1>db_ctrl.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -165,7 +165,7 @@ <h1>db_ctrl.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/db_recv.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/db_recv.py.html
index 73f8b41361..68fcc1601c 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/db_recv.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/db_recv.py.html
@@ -189,7 +189,7 @@ <h1>db_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>db_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/db_send.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/db_send.py.html
index 28569adc0d..4273c6942b 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/db_send.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/db_send.py.html
@@ -220,7 +220,7 @@ <h1>db_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -228,7 +228,7 @@ <h1>db_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/direct_recv.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/direct_recv.py.html
index 73f3de61af..b2e823dcb5 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/direct_recv.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/direct_recv.py.html
@@ -169,7 +169,7 @@ <h1>direct_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -177,7 +177,7 @@ <h1>direct_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/direct_send.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/direct_send.py.html
index 0017f5979f..40d701e26a 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/direct_send.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/direct_send.py.html
@@ -176,7 +176,7 @@ <h1>direct_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -184,7 +184,7 @@ <h1>direct_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld.py.html
index 8a8db94aa9..5a366b07df 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld.py.html
@@ -156,7 +156,7 @@ <h1>helloworld.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h1>helloworld.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_blocking.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_blocking.py.html
index efcef60e3f..2fefc92dcf 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_blocking.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_blocking.py.html
@@ -141,7 +141,7 @@ <h1>helloworld_blocking.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -149,7 +149,7 @@ <h1>helloworld_blocking.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_direct.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_direct.py.html
index 9098016fd6..5c785b6e8c 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_direct.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_direct.py.html
@@ -159,7 +159,7 @@ <h1>helloworld_direct.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h1>helloworld_direct.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_direct_tornado.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_direct_tornado.py.html
index bac87984ad..c9c637577a 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_direct_tornado.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_direct_tornado.py.html
@@ -159,7 +159,7 @@ <h1>helloworld_direct_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h1>helloworld_direct_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_tornado.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_tornado.py.html
index a438b6e2c7..fcaf0ad6b5 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_tornado.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/helloworld_tornado.py.html
@@ -156,7 +156,7 @@ <h1>helloworld_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -164,7 +164,7 @@ <h1>helloworld_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/index.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/index.html
index 3c359fe0a1..42228b1f38 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/index.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/index.html
@@ -170,7 +170,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -178,7 +178,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/proton_server.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/proton_server.py.html
index de06b5564d..b096a4d386 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/proton_server.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/proton_server.py.html
@@ -162,7 +162,7 @@ <h1>proton_server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -170,7 +170,7 @@ <h1>proton_server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/proton_tornado.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/proton_tornado.py.html
index 64941eb652..8866eae853 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/proton_tornado.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/proton_tornado.py.html
@@ -233,7 +233,7 @@ <h1>proton_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -241,7 +241,7 @@ <h1>proton_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/queue_browser.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/queue_browser.py.html
index 53b31e5682..10e241b76d 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/queue_browser.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/queue_browser.py.html
@@ -152,7 +152,7 @@ <h1>queue_browser.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h1>queue_browser.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/recurring_timer.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/recurring_timer.py.html
index a7e033cd86..839756e0e2 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/recurring_timer.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/recurring_timer.py.html
@@ -152,7 +152,7 @@ <h1>recurring_timer.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h1>recurring_timer.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/recurring_timer_tornado.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/recurring_timer_tornado.py.html
index 0b261f5814..9828d8fc1e 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/recurring_timer_tornado.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/recurring_timer_tornado.py.html
@@ -153,7 +153,7 @@ <h1>recurring_timer_tornado.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -161,7 +161,7 @@ <h1>recurring_timer_tornado.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/selected_recv.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/selected_recv.py.html
index 89036b4a94..9b2e9b685b 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/selected_recv.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/selected_recv.py.html
@@ -166,7 +166,7 @@ <h1>selected_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -174,7 +174,7 @@ <h1>selected_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/server.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/server.py.html
index aa700d0b9a..dbf18a10e0 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/server.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/server.py.html
@@ -182,7 +182,7 @@ <h1>server.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h1>server.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/server_direct.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/server_direct.py.html
index 9a3be9aede..10ceaa846e 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/server_direct.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/server_direct.py.html
@@ -174,7 +174,7 @@ <h1>server_direct.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h1>server_direct.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/server_tx.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/server_tx.py.html
index e95de94469..cb03518d63 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/server_tx.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/server_tx.py.html
@@ -189,7 +189,7 @@ <h1>server_tx.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>server_tx.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/simple_recv.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/simple_recv.py.html
index e8c721ea40..628feea722 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/simple_recv.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/simple_recv.py.html
@@ -168,7 +168,7 @@ <h1>simple_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h1>simple_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/simple_send.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/simple_send.py.html
index e5d1bba633..f85251f380 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/simple_send.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/simple_send.py.html
@@ -175,7 +175,7 @@ <h1>simple_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -183,7 +183,7 @@ <h1>simple_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/sync_client.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/sync_client.py.html
index f74270ab6a..716d0511de 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/sync_client.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/sync_client.py.html
@@ -160,7 +160,7 @@ <h1>sync_client.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h1>sync_client.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/test_examples.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/test_examples.py.html
index ae41422e99..0028c01ac7 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/test_examples.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/test_examples.py.html
@@ -283,7 +283,7 @@ <h1>test_examples.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -291,7 +291,7 @@ <h1>test_examples.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_recv.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_recv.py.html
index ecfd701e43..bee5c733e9 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_recv.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_recv.py.html
@@ -189,7 +189,7 @@ <h1>tx_recv.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h1>tx_recv.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_recv_interactive.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_recv_interactive.py.html
index 27209849dc..5625a8b690 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_recv_interactive.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_recv_interactive.py.html
@@ -195,7 +195,7 @@ <h1>tx_recv_interactive.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -203,7 +203,7 @@ <h1>tx_recv_interactive.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_send.py.html b/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_send.py.html
index 0f8eb9e9bc..f92248e41a 100644
--- a/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_send.py.html
+++ b/content/releases/qpid-proton-0.40.0/proton/python/examples/tx_send.py.html
@@ -201,7 +201,7 @@ <h1>tx_send.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -209,7 +209,7 @@ <h1>tx_send.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/broker.rb.html b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/broker.rb.html
index 0106bcb2ce..b9bbbbbb73 100644
--- a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/broker.rb.html
+++ b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/broker.rb.html
@@ -285,7 +285,7 @@ <h1>broker.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -293,7 +293,7 @@ <h1>broker.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/client.rb.html b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/client.rb.html
index 818ca6aa0b..85e9c1823d 100644
--- a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/client.rb.html
+++ b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/client.rb.html
@@ -190,7 +190,7 @@ <h1>client.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -198,7 +198,7 @@ <h1>client.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/direct_recv.rb.html b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/direct_recv.rb.html
index f8ff2b2fce..45f1e976d0 100644
--- a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/direct_recv.rb.html
+++ b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/direct_recv.rb.html
@@ -171,7 +171,7 @@ <h1>direct_recv.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -179,7 +179,7 @@ <h1>direct_recv.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/direct_send.rb.html b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/direct_send.rb.html
index 03d44756c5..d0c47f5177 100644
--- a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/direct_send.rb.html
+++ b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/direct_send.rb.html
@@ -178,7 +178,7 @@ <h1>direct_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -186,7 +186,7 @@ <h1>direct_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/helloworld.rb.html b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/helloworld.rb.html
index 39fc7eef87..4cc0ce431c 100644
--- a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/helloworld.rb.html
+++ b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/helloworld.rb.html
@@ -168,7 +168,7 @@ <h1>helloworld.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -176,7 +176,7 @@ <h1>helloworld.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/index.html b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/index.html
index b1a4640219..ea8c44229e 100644
--- a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/index.html
+++ b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/index.html
@@ -147,7 +147,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/server.rb.html b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/server.rb.html
index 3653bfaaae..bfaff8dc75 100644
--- a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/server.rb.html
+++ b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/server.rb.html
@@ -181,7 +181,7 @@ <h1>server.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -189,7 +189,7 @@ <h1>server.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/simple_recv.rb.html b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/simple_recv.rb.html
index 4d680216be..e72118e5c2 100644
--- a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/simple_recv.rb.html
+++ b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/simple_recv.rb.html
@@ -167,7 +167,7 @@ <h1>simple_recv.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -175,7 +175,7 @@ <h1>simple_recv.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/simple_send.rb.html b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/simple_send.rb.html
index c8b2a9ee6a..7194eccccb 100644
--- a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/simple_send.rb.html
+++ b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/simple_send.rb.html
@@ -174,7 +174,7 @@ <h1>simple_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -182,7 +182,7 @@ <h1>simple_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/ssl_send.rb.html b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/ssl_send.rb.html
index b99cef3924..3143b8365b 100644
--- a/content/releases/qpid-proton-0.40.0/proton/ruby/examples/ssl_send.rb.html
+++ b/content/releases/qpid-proton-0.40.0/proton/ruby/examples/ssl_send.rb.html
@@ -182,7 +182,7 @@ <h1>ssl_send.rb</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -190,7 +190,7 @@ <h1>ssl_send.rb</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-0.40.0/release-notes.html b/content/releases/qpid-proton-0.40.0/release-notes.html
index baa0c9bcd8..58108dd86d 100644
--- a/content/releases/qpid-proton-0.40.0/release-notes.html
+++ b/content/releases/qpid-proton-0.40.0/release-notes.html
@@ -202,7 +202,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -210,7 +210,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M1/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M1/index.html
index f392e516fd..c47387e2f6 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M1/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M1/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M1/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M1/release-notes.html
index 9fe6fd9a31..549ec15b6b 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M1/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M1/release-notes.html
@@ -155,7 +155,7 @@ <h1 id="errata-note-on-building-the-100-m1-release">Errata note on building the
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -163,7 +163,7 @@ <h1 id="errata-note-on-building-the-100-m1-release">Errata note on building the
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M10/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M10/index.html
index 78c38f4632..1bfa441c1d 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M10/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M10/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M10/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M10/release-notes.html
index fb055b3dc7..7bccf9a8b0 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M10/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M10/release-notes.html
@@ -155,7 +155,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -163,7 +163,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M11/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M11/index.html
index 11a4c0d3fe..db2ec14833 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M11/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M11/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M11/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M11/release-notes.html
index fe634353cf..b2f63f3a1e 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M11/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M11/release-notes.html
@@ -139,7 +139,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -147,7 +147,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M2/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M2/index.html
index 08eed0bee7..f3b37bc3bd 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M2/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M2/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M2/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M2/release-notes.html
index 352056dd79..13ab797b3a 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M2/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M2/release-notes.html
@@ -145,7 +145,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M3/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M3/index.html
index f787cc888f..dc183004d9 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M3/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M3/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M3/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M3/release-notes.html
index f6c7fc3f8c..420e5b9c43 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M3/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M3/release-notes.html
@@ -147,7 +147,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M4/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M4/index.html
index 62031c1ccb..9e3454f007 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M4/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M4/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M4/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M4/release-notes.html
index 903fb1abe7..0e6c6ababd 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M4/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M4/release-notes.html
@@ -145,7 +145,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M5/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M5/index.html
index 4214c98f08..19ac61cf69 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M5/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M5/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M5/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M5/release-notes.html
index 9b57e28c7c..6a08019627 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M5/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M5/release-notes.html
@@ -147,7 +147,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M6/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M6/index.html
index c98324ddd3..70f9bd061e 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M6/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M6/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M6/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M6/release-notes.html
index b7eee10149..03cf9f55c3 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M6/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M6/release-notes.html
@@ -145,7 +145,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M7/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M7/index.html
index 7c9170e6b4..c7cf48df12 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M7/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M7/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M7/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M7/release-notes.html
index 5a5c0ea951..e4a7cea181 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M7/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M7/release-notes.html
@@ -150,7 +150,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M8/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M8/index.html
index b09f2a74bf..2595b18b3c 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M8/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M8/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M8/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M8/release-notes.html
index 069fee5af9..917296b687 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M8/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M8/release-notes.html
@@ -153,7 +153,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -161,7 +161,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M9/index.html b/content/releases/qpid-proton-dotnet-1.0.0-M9/index.html
index 0d44b48ef5..ad29f9c24b 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M9/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M9/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0-M9/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0-M9/release-notes.html
index 3defde1b06..f0ffe58cfc 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0-M9/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0-M9/release-notes.html
@@ -148,7 +148,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0/index.html b/content/releases/qpid-proton-dotnet-1.0.0/index.html
index 265d0018d5..40e1f565de 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0/index.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.0.0/release-notes.html b/content/releases/qpid-proton-dotnet-1.0.0/release-notes.html
index 4953997e04..ac35db940e 100644
--- a/content/releases/qpid-proton-dotnet-1.0.0/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.0.0/release-notes.html
@@ -138,7 +138,7 @@ <h2 id="new-features-and-improvements">New features and improvements</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h2 id="new-features-and-improvements">New features and improvements</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.1.0/index.html b/content/releases/qpid-proton-dotnet-1.1.0/index.html
index 75bbc0c539..58f9c6a59f 100644
--- a/content/releases/qpid-proton-dotnet-1.1.0/index.html
+++ b/content/releases/qpid-proton-dotnet-1.1.0/index.html
@@ -187,7 +187,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-dotnet-1.1.0/release-notes.html b/content/releases/qpid-proton-dotnet-1.1.0/release-notes.html
index 0dd5839485..b6aed2bd2c 100644
--- a/content/releases/qpid-proton-dotnet-1.1.0/release-notes.html
+++ b/content/releases/qpid-proton-dotnet-1.1.0/release-notes.html
@@ -134,7 +134,7 @@ <h1 id="qpid-proton-dotnet-110-release-notes">Qpid Proton Dotnet 1.1.0 Release N
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -142,7 +142,7 @@ <h1 id="qpid-proton-dotnet-110-release-notes">Qpid Proton Dotnet 1.1.0 Release N
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-j-0.33.10/index.html b/content/releases/qpid-proton-j-0.33.10/index.html
index 72e5d25bdc..184b5a669a 100644
--- a/content/releases/qpid-proton-j-0.33.10/index.html
+++ b/content/releases/qpid-proton-j-0.33.10/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-j-0.33.10/release-notes.html b/content/releases/qpid-proton-j-0.33.10/release-notes.html
index 3d3ea813d7..4e2d4d039c 100644
--- a/content/releases/qpid-proton-j-0.33.10/release-notes.html
+++ b/content/releases/qpid-proton-j-0.33.10/release-notes.html
@@ -138,7 +138,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -146,7 +146,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-j-0.33.9/index.html b/content/releases/qpid-proton-j-0.33.9/index.html
index 9f93989d1a..83e76e4c8e 100644
--- a/content/releases/qpid-proton-j-0.33.9/index.html
+++ b/content/releases/qpid-proton-j-0.33.9/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-j-0.33.9/release-notes.html b/content/releases/qpid-proton-j-0.33.9/release-notes.html
index 505c6d6d77..6011c7feb8 100644
--- a/content/releases/qpid-proton-j-0.33.9/release-notes.html
+++ b/content/releases/qpid-proton-j-0.33.9/release-notes.html
@@ -144,7 +144,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-j-0.34.0/index.html b/content/releases/qpid-proton-j-0.34.0/index.html
index 15c3ef7735..cfe5fccf8e 100644
--- a/content/releases/qpid-proton-j-0.34.0/index.html
+++ b/content/releases/qpid-proton-j-0.34.0/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-j-0.34.0/release-notes.html b/content/releases/qpid-proton-j-0.34.0/release-notes.html
index b9e241e7cd..600db71af0 100644
--- a/content/releases/qpid-proton-j-0.34.0/release-notes.html
+++ b/content/releases/qpid-proton-j-0.34.0/release-notes.html
@@ -147,7 +147,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-j-0.34.1/index.html b/content/releases/qpid-proton-j-0.34.1/index.html
index 0cf60d0a32..93ad16caa3 100644
--- a/content/releases/qpid-proton-j-0.34.1/index.html
+++ b/content/releases/qpid-proton-j-0.34.1/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-j-0.34.1/release-notes.html b/content/releases/qpid-proton-j-0.34.1/release-notes.html
index b48d187e26..15f1a7eb2f 100644
--- a/content/releases/qpid-proton-j-0.34.1/release-notes.html
+++ b/content/releases/qpid-proton-j-0.34.1/release-notes.html
@@ -145,7 +145,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -153,7 +153,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-j-0.35.0/index.html b/content/releases/qpid-proton-j-0.35.0/index.html
index 637f24ac41..6faf6326b4 100644
--- a/content/releases/qpid-proton-j-0.35.0/index.html
+++ b/content/releases/qpid-proton-j-0.35.0/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-proton-j-0.35.0/release-notes.html b/content/releases/qpid-proton-j-0.35.0/release-notes.html
index 9d009e653c..6855a48849 100644
--- a/content/releases/qpid-proton-j-0.35.0/release-notes.html
+++ b/content/releases/qpid-proton-j-0.35.0/release-notes.html
@@ -149,7 +149,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M10/index.html b/content/releases/qpid-protonj2-1.0.0-M10/index.html
index 09e9bc5cd5..84fabe4f1d 100644
--- a/content/releases/qpid-protonj2-1.0.0-M10/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M10/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M10/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M10/release-notes.html
index 5e77a5f680..7609c96a9f 100644
--- a/content/releases/qpid-protonj2-1.0.0-M10/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M10/release-notes.html
@@ -150,7 +150,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M11/index.html b/content/releases/qpid-protonj2-1.0.0-M11/index.html
index 081893d744..e2d49e1843 100644
--- a/content/releases/qpid-protonj2-1.0.0-M11/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M11/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M11/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M11/release-notes.html
index 4afbe2da29..a07e319e26 100644
--- a/content/releases/qpid-protonj2-1.0.0-M11/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M11/release-notes.html
@@ -152,7 +152,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M12/index.html b/content/releases/qpid-protonj2-1.0.0-M12/index.html
index 0b59fa281d..f6e4bd6e72 100644
--- a/content/releases/qpid-protonj2-1.0.0-M12/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M12/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M12/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M12/release-notes.html
index 1081d49de1..12a41e33ef 100644
--- a/content/releases/qpid-protonj2-1.0.0-M12/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M12/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M13/index.html b/content/releases/qpid-protonj2-1.0.0-M13/index.html
index 419f7ebab8..5683a39c8f 100644
--- a/content/releases/qpid-protonj2-1.0.0-M13/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M13/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M13/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M13/release-notes.html
index 860e42988a..d0ff1c7255 100644
--- a/content/releases/qpid-protonj2-1.0.0-M13/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M13/release-notes.html
@@ -158,7 +158,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -166,7 +166,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M14/index.html b/content/releases/qpid-protonj2-1.0.0-M14/index.html
index 70876e91b7..56bfc8f0b5 100644
--- a/content/releases/qpid-protonj2-1.0.0-M14/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M14/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M14/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M14/release-notes.html
index 109a3f2350..3bf5465710 100644
--- a/content/releases/qpid-protonj2-1.0.0-M14/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M14/release-notes.html
@@ -151,7 +151,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -159,7 +159,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M15/index.html b/content/releases/qpid-protonj2-1.0.0-M15/index.html
index 1380fde142..aae57b60f9 100644
--- a/content/releases/qpid-protonj2-1.0.0-M15/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M15/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M15/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M15/release-notes.html
index 0a6d57a24e..5354540acd 100644
--- a/content/releases/qpid-protonj2-1.0.0-M15/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M15/release-notes.html
@@ -152,7 +152,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M16/index.html b/content/releases/qpid-protonj2-1.0.0-M16/index.html
index 6b45743536..40059ea1a5 100644
--- a/content/releases/qpid-protonj2-1.0.0-M16/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M16/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M16/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M16/release-notes.html
index 99a9c65d1e..5b0a86cc75 100644
--- a/content/releases/qpid-protonj2-1.0.0-M16/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M16/release-notes.html
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -162,7 +162,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M17/index.html b/content/releases/qpid-protonj2-1.0.0-M17/index.html
index f23dd6d16a..20dc2a0901 100644
--- a/content/releases/qpid-protonj2-1.0.0-M17/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M17/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M17/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M17/release-notes.html
index 8410117590..1aae62e7f0 100644
--- a/content/releases/qpid-protonj2-1.0.0-M17/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M17/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M18/index.html b/content/releases/qpid-protonj2-1.0.0-M18/index.html
index e594c7b121..6f574d8ebd 100644
--- a/content/releases/qpid-protonj2-1.0.0-M18/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M18/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M18/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M18/release-notes.html
index 7c270919fd..b5be9b6276 100644
--- a/content/releases/qpid-protonj2-1.0.0-M18/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M18/release-notes.html
@@ -140,7 +140,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -148,7 +148,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M19/index.html b/content/releases/qpid-protonj2-1.0.0-M19/index.html
index b7a2e7df21..a7021f7182 100644
--- a/content/releases/qpid-protonj2-1.0.0-M19/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M19/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M19/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M19/release-notes.html
index 9d0e5276d0..d74ffa133f 100644
--- a/content/releases/qpid-protonj2-1.0.0-M19/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M19/release-notes.html
@@ -153,7 +153,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -161,7 +161,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M20/index.html b/content/releases/qpid-protonj2-1.0.0-M20/index.html
index ace86c7871..a7f3a76d65 100644
--- a/content/releases/qpid-protonj2-1.0.0-M20/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M20/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M20/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M20/release-notes.html
index 8d11de3f80..c88c0db5c7 100644
--- a/content/releases/qpid-protonj2-1.0.0-M20/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M20/release-notes.html
@@ -159,7 +159,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -167,7 +167,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M21/index.html b/content/releases/qpid-protonj2-1.0.0-M21/index.html
index 68bef4f595..a46939432c 100644
--- a/content/releases/qpid-protonj2-1.0.0-M21/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M21/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M21/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M21/release-notes.html
index 3983be5230..4ef6d2a672 100644
--- a/content/releases/qpid-protonj2-1.0.0-M21/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M21/release-notes.html
@@ -147,7 +147,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M22/index.html b/content/releases/qpid-protonj2-1.0.0-M22/index.html
index 07802b1d89..164a8d911e 100644
--- a/content/releases/qpid-protonj2-1.0.0-M22/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M22/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M22/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M22/release-notes.html
index ee0f7cca31..2f2df24248 100644
--- a/content/releases/qpid-protonj2-1.0.0-M22/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M22/release-notes.html
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -162,7 +162,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M23/index.html b/content/releases/qpid-protonj2-1.0.0-M23/index.html
index a002981c8d..2c8b423798 100644
--- a/content/releases/qpid-protonj2-1.0.0-M23/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M23/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M23/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M23/release-notes.html
index 34178f4b63..59e5e768e5 100644
--- a/content/releases/qpid-protonj2-1.0.0-M23/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M23/release-notes.html
@@ -153,7 +153,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -161,7 +161,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M3/index.html b/content/releases/qpid-protonj2-1.0.0-M3/index.html
index 6b23cb178d..db9a0faefe 100644
--- a/content/releases/qpid-protonj2-1.0.0-M3/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M3/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M3/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M3/release-notes.html
index 6d5ccbbb11..3b5c5c5a3f 100644
--- a/content/releases/qpid-protonj2-1.0.0-M3/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M3/release-notes.html
@@ -160,7 +160,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -168,7 +168,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M4/index.html b/content/releases/qpid-protonj2-1.0.0-M4/index.html
index e3b69d346e..3303dfcaf0 100644
--- a/content/releases/qpid-protonj2-1.0.0-M4/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M4/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M4/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M4/release-notes.html
index 5e2e82bcca..db0eae01df 100644
--- a/content/releases/qpid-protonj2-1.0.0-M4/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M4/release-notes.html
@@ -148,7 +148,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M5/index.html b/content/releases/qpid-protonj2-1.0.0-M5/index.html
index d80ecc068c..0be5c7b228 100644
--- a/content/releases/qpid-protonj2-1.0.0-M5/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M5/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M5/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M5/release-notes.html
index 30845e29a1..684a29c26c 100644
--- a/content/releases/qpid-protonj2-1.0.0-M5/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M5/release-notes.html
@@ -158,7 +158,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -166,7 +166,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M6/index.html b/content/releases/qpid-protonj2-1.0.0-M6/index.html
index 6feeaf64c7..4a7bf0b81d 100644
--- a/content/releases/qpid-protonj2-1.0.0-M6/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M6/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M6/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M6/release-notes.html
index 7ccc44f052..80d8c28e83 100644
--- a/content/releases/qpid-protonj2-1.0.0-M6/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M6/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M7/index.html b/content/releases/qpid-protonj2-1.0.0-M7/index.html
index 298ba82670..2b3253cfd2 100644
--- a/content/releases/qpid-protonj2-1.0.0-M7/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M7/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M7/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M7/release-notes.html
index f20b2b9c90..81045b5e77 100644
--- a/content/releases/qpid-protonj2-1.0.0-M7/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M7/release-notes.html
@@ -152,7 +152,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M8/index.html b/content/releases/qpid-protonj2-1.0.0-M8/index.html
index 7173ebc043..d05dae5a50 100644
--- a/content/releases/qpid-protonj2-1.0.0-M8/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M8/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M8/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M8/release-notes.html
index 31f690c008..58ad58ed5e 100644
--- a/content/releases/qpid-protonj2-1.0.0-M8/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M8/release-notes.html
@@ -146,7 +146,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -154,7 +154,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M9/index.html b/content/releases/qpid-protonj2-1.0.0-M9/index.html
index 2b8120e34a..06f53bb80b 100644
--- a/content/releases/qpid-protonj2-1.0.0-M9/index.html
+++ b/content/releases/qpid-protonj2-1.0.0-M9/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0-M9/release-notes.html b/content/releases/qpid-protonj2-1.0.0-M9/release-notes.html
index 4a7febb88e..33987d99ab 100644
--- a/content/releases/qpid-protonj2-1.0.0-M9/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0-M9/release-notes.html
@@ -152,7 +152,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -160,7 +160,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0/index.html b/content/releases/qpid-protonj2-1.0.0/index.html
index 4ae8975555..811d1ff9ad 100644
--- a/content/releases/qpid-protonj2-1.0.0/index.html
+++ b/content/releases/qpid-protonj2-1.0.0/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.0.0/release-notes.html b/content/releases/qpid-protonj2-1.0.0/release-notes.html
index 2217bbb380..8c07c0f6be 100644
--- a/content/releases/qpid-protonj2-1.0.0/release-notes.html
+++ b/content/releases/qpid-protonj2-1.0.0/release-notes.html
@@ -158,7 +158,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -166,7 +166,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.1.0/index.html b/content/releases/qpid-protonj2-1.1.0/index.html
index 9f6f09990b..0359be5918 100644
--- a/content/releases/qpid-protonj2-1.1.0/index.html
+++ b/content/releases/qpid-protonj2-1.1.0/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.1.0/release-notes.html b/content/releases/qpid-protonj2-1.1.0/release-notes.html
index 8bb572fd46..586e84bde3 100644
--- a/content/releases/qpid-protonj2-1.1.0/release-notes.html
+++ b/content/releases/qpid-protonj2-1.1.0/release-notes.html
@@ -151,7 +151,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -159,7 +159,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.2.0/index.html b/content/releases/qpid-protonj2-1.2.0/index.html
index b3d7591d8a..6be683b045 100644
--- a/content/releases/qpid-protonj2-1.2.0/index.html
+++ b/content/releases/qpid-protonj2-1.2.0/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.2.0/release-notes.html b/content/releases/qpid-protonj2-1.2.0/release-notes.html
index a5b57aef60..7cbbd425c8 100644
--- a/content/releases/qpid-protonj2-1.2.0/release-notes.html
+++ b/content/releases/qpid-protonj2-1.2.0/release-notes.html
@@ -149,7 +149,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -157,7 +157,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.3.0/index.html b/content/releases/qpid-protonj2-1.3.0/index.html
index cc5778cd76..7a92273269 100644
--- a/content/releases/qpid-protonj2-1.3.0/index.html
+++ b/content/releases/qpid-protonj2-1.3.0/index.html
@@ -189,7 +189,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-protonj2-1.3.0/release-notes.html b/content/releases/qpid-protonj2-1.3.0/release-notes.html
index 42e8005969..00ffc5a78f 100644
--- a/content/releases/qpid-protonj2-1.3.0/release-notes.html
+++ b/content/releases/qpid-protonj2-1.3.0/release-notes.html
@@ -147,7 +147,7 @@ <h2 id="tasks">Tasks</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -155,7 +155,7 @@ <h2 id="tasks">Tasks</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-python-1.37.0/index.html b/content/releases/qpid-python-1.37.0/index.html
index 4e726130fd..0e5b1025ed 100644
--- a/content/releases/qpid-python-1.37.0/index.html
+++ b/content/releases/qpid-python-1.37.0/index.html
@@ -205,7 +205,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -213,7 +213,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-python-1.37.0/messaging-api/examples/drain.html b/content/releases/qpid-python-1.37.0/messaging-api/examples/drain.html
index b8f4e867b9..ec29698c50 100644
--- a/content/releases/qpid-python-1.37.0/messaging-api/examples/drain.html
+++ b/content/releases/qpid-python-1.37.0/messaging-api/examples/drain.html
@@ -207,7 +207,7 @@ <h1>drain</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -215,7 +215,7 @@ <h1>drain</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-python-1.37.0/messaging-api/examples/hello.html b/content/releases/qpid-python-1.37.0/messaging-api/examples/hello.html
index d75accde79..ee7aded383 100644
--- a/content/releases/qpid-python-1.37.0/messaging-api/examples/hello.html
+++ b/content/releases/qpid-python-1.37.0/messaging-api/examples/hello.html
@@ -162,7 +162,7 @@ <h1>hello</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -170,7 +170,7 @@ <h1>hello</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-python-1.37.0/messaging-api/examples/hello_xml.html b/content/releases/qpid-python-1.37.0/messaging-api/examples/hello_xml.html
index 64cf171024..86dd3594ac 100644
--- a/content/releases/qpid-python-1.37.0/messaging-api/examples/hello_xml.html
+++ b/content/releases/qpid-python-1.37.0/messaging-api/examples/hello_xml.html
@@ -187,7 +187,7 @@ <h1>hello_xml</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -195,7 +195,7 @@ <h1>hello_xml</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-python-1.37.0/messaging-api/examples/index.html b/content/releases/qpid-python-1.37.0/messaging-api/examples/index.html
index 233e3ef497..a3d7b8fd9c 100644
--- a/content/releases/qpid-python-1.37.0/messaging-api/examples/index.html
+++ b/content/releases/qpid-python-1.37.0/messaging-api/examples/index.html
@@ -144,7 +144,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -152,7 +152,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-python-1.37.0/messaging-api/examples/server.html b/content/releases/qpid-python-1.37.0/messaging-api/examples/server.html
index 024ebb1cec..ec7de1a7de 100644
--- a/content/releases/qpid-python-1.37.0/messaging-api/examples/server.html
+++ b/content/releases/qpid-python-1.37.0/messaging-api/examples/server.html
@@ -205,7 +205,7 @@ <h1>server</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -213,7 +213,7 @@ <h1>server</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-python-1.37.0/messaging-api/examples/spout.html b/content/releases/qpid-python-1.37.0/messaging-api/examples/spout.html
index 878b573e49..a0fb85f8d4 100644
--- a/content/releases/qpid-python-1.37.0/messaging-api/examples/spout.html
+++ b/content/releases/qpid-python-1.37.0/messaging-api/examples/spout.html
@@ -243,7 +243,7 @@ <h1>spout</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -251,7 +251,7 @@ <h1>spout</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-python-1.37.0/messaging-api/examples/statistics.py.html b/content/releases/qpid-python-1.37.0/messaging-api/examples/statistics.py.html
index 8b3515ad44..35b3e5f750 100644
--- a/content/releases/qpid-python-1.37.0/messaging-api/examples/statistics.py.html
+++ b/content/releases/qpid-python-1.37.0/messaging-api/examples/statistics.py.html
@@ -249,7 +249,7 @@ <h1>statistics.py</h1>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -257,7 +257,7 @@ <h1>statistics.py</h1>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/releases/qpid-python-1.37.0/release-notes.html b/content/releases/qpid-python-1.37.0/release-notes.html
index a1cd2033a4..53597d996c 100644
--- a/content/releases/qpid-python-1.37.0/release-notes.html
+++ b/content/releases/qpid-python-1.37.0/release-notes.html
@@ -150,7 +150,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -158,7 +158,7 @@ <h2 id="bugs-fixed">Bugs fixed</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/resources.html b/content/resources.html
index 6b437f7072..0937161bd5 100644
--- a/content/resources.html
+++ b/content/resources.html
@@ -235,7 +235,7 @@ <h2 id="more">More</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -243,7 +243,7 @@ <h2 id="more">More</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/search.html b/content/search.html
index 69eae4c9e2..bdc07a1952 100644
--- a/content/search.html
+++ b/content/search.html
@@ -148,7 +148,7 @@ <h3 id="search-issues">Search issues</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -156,7 +156,7 @@ <h3 id="search-issues">Search issues</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/security.html b/content/security.html
index 93c2247177..ab1049252b 100644
--- a/content/security.html
+++ b/content/security.html
@@ -189,7 +189,7 @@ <h2 id="reporting-new-security-problems-with-apache-qpid">Reporting new security
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -197,7 +197,7 @@ <h2 id="reporting-new-security-problems-with-apache-qpid">Reporting new security
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/site.css b/content/site.css
index bb46938405..c64608a9a5 100644
--- a/content/site.css
+++ b/content/site.css
@@ -395,9 +395,12 @@ div.imageblock div.content img {
     display: inline;
 }
 
-#-apache-feather {
-    display: inline;
-    vertical-align: -0.07em;
+#-asf-logo {
+    display: inline-block;
+    width: auto;
+    height: 2em;
+    margin: 0 0 0 0.75em;
+    vertical-align: middle;
 }
 
 #-legal {
diff --git a/content/site.html b/content/site.html
index a3698f01b2..6d7c49ee1e 100644
--- a/content/site.html
+++ b/content/site.html
@@ -169,7 +169,7 @@ <h2 id="source-code">Source code</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -177,7 +177,7 @@ <h2 id="source-code">Source code</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/content/source-code.html b/content/source-code.html
index 2e8bb7f0eb..e63aa748e3 100644
--- a/content/source-code.html
+++ b/content/source-code.html
@@ -203,7 +203,7 @@ <h2 id="more-information">More information</h2>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -211,7 +211,7 @@ <h2 id="more-information">More information</h2>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/input/_transom_template.html b/input/_transom_template.html
index a107718236..ffcd10aa1c 100644
--- a/input/_transom_template.html
+++ b/input/_transom_template.html
@@ -125,7 +125,7 @@ <h3>Resources</h3>
             <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
             <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
             <li><a href="{{site_url}}/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+            <li><a href="https://www.apache.org/"><img id="-asf-logo" width="80" height="42" src="{{site_url}}/images/asf-logo.svg" alt="The ASF"/></a></li>
           </ul>
 
           <p id="-legal">
@@ -133,7 +133,7 @@ <h3>Resources</h3>
             The Apache Software Foundation; Licensed under
             the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
             License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            Proton, Apache, the Apache logo, and the Apache Qpid
             project logo are trademarks of The Apache Software
             Foundation; All other marks mentioned may be trademarks or
             registered trademarks of their respective owners
diff --git a/input/deferred.js b/input/deferred.js
index f8eb8758fa..0c3184a421 100644
--- a/input/deferred.js
+++ b/input/deferred.js
@@ -233,20 +233,6 @@ function _updatePathNavigation() {
     }
 }
 
-var _apacheFeather = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAOCAYAAABQFS4BAAAFnElEQVRIx83S22ukdx3H8e/v8Pyew5xnsrMJSZNsmm4PW91uL5ZWhIK9EA/Fq8Uiite9EuzVFhbxoqvd7kWLVEWEuioqpQgVtmpFssZtabpR9xCb7uQwmexMspPM5JmZ5/w8v9/v64UtiCi2StX3X/CCz4fMz8w8vN5qLSGihnf7ypkzdw333Eeaq43f/G7xtRb8H0bOnz//+He/9cLjCHpZEfL9ZrN5+9wLL55GUJ/f2W7B3M+WnzZRfqmAukA0jgpVfu1NHF1dGHZ+abbnswVckP8T+Orq6tEwjJ5/9plvlv5wZflO1PriY6dOYcwKX6xWyli/uLUaRf2jdwRUTBGl+kL6PA5HlVGQ2zNVK7T0WlJhr1wW6hcvLizE/zU4IsLS0lKxVjv09dXVP3/5RxcuHNy4dn18/r77LCIKOBFN+XWds4uQcuEOCKOZOr6b8O6E0OV+AGUtVd+I99JS4ks3XWncgctqlv36qe+9dvVDh79Xo9E4ufzH61/b6e5/YnHxEvY7bYPGNs5Wj+s8q4GdY7TkR8gxFGNdATiZKifwyHTXBZnPqZR4EScq9aNQxfPkem8YvVPhxhu/Pch+9YM/LQw+NPgTp0/PVuzydxTwh6M4sk9gLrj51nZxhwWqPdwgeXFYVcQkpdqgRlbmDhI1z3sqsyjPp4GquSMSCIrTUUATJlJSSKMeCePJ7TTr5OTQrBsH7JAY9kDK3n504WK7/ebi2tr+fww/e/bcZ6rj489YljNj2zYUnv6x50VpXRoFFGmFL9QTKR2qtocbdDAI+HhlBkp0QumUkgckI/0q6OPuEHrlHFaTEeaTGHUA3MwzXXB9Gtg69axcaoYBt+NwEN7N/L0idvsr2TtpPrnCHilcOn32lfUPDG82mx/dat366sR4XW9ttUz9k1c/LV5fLylb4DGX0x/OjeuwMh0DoKF9yg/EjhrpHu4MtlgYKFIvTslJo0oTXcGTI5f2ihVdFEBEGGhOJB3latqWrprrBwa3Ez0kDl5lR8jd5oZv0CAd21RsO99ruyet55e8Wy+/9NKK/77g7/78HinlpmmaH9Fan+ldfvVT8Po1VlpL2VVq60IM6TDTzIkOGe44xBEXYOuEbViCeSyRcerhXtBlu26blewxnTcPY44yQLRBgca52KYz6BMTDL1sztM7jU00MiWjxOEP8S5WICK7EtrJgcvg0ULXOZrnmxitdQ+it/3B8LlvfPv37j+E/33r6xvnR8POF8JOozh6e004FzehdluzQbFM0VRxzAUSRJIhwX6GlOdySgJhocH5fhqgb9kqIgAcQgiYAXE2Yv1gQJRCYMjJlEI5yh/GIzo05oNMdUSRTSovPTaMhHvqcBpMUmIWUMkMItRhZ9f1fvrEkz8/9y/hf12heZxz/KTS+nO3b63cG/VvOvLyBoOmr8enLOoveiT3MQfxUkC6JigClDAF1NAKUuFgGSg2c4bUjINODbZPJF3nd9H7RUdFQUgaloVjmYcDs05M1YWBClFUGZs8kqpqxQGDE0oBkHOiewM/VFl87X3B/7Zms/mYUvjZKPIe8lu7VSn2S8mVthGzgCIJCH2jD3yoSBpr4tQYhAQwvydJDYnuGEwxhcxWSPYYp9IXMCdivWMbmACiiRrUkLKyleq+JVBMC6ofFbpUNQEVAEpJGzsuuAMVfWD4e7XbbdtPknsp4oME8R4AOg2g61HgV73RIGdorr1GK+/vbrPEyuxiMyJwgsvkUo+jDgxdtzANU8PeylT+42PS24iQFBixcijkyInh/kqaBcpwWiM4eNAE7gjl5OuqUDsWT0zO7P7b8H/WjRs3Koh4qFwuZ1mWPYAIJwCwCAA5JKREEPJKqRnKmUcQbSCEESAeAqSISAmBKiKuEIAuALUQ9BglBBExopSuUkpfnp2dvfkX6a5m0ZqSUXAAAAAASUVORK5CYII="
-
-function _updateApacheNavigation() {
-    var elem = document.getElementById("-apache-feather");
-
-    if (!elem) {
-        return;
-    }
-
-    _log("Updating Apache navigation");
-
-    elem.src = _apacheFeather;
-}
-
 function _getHeadings() {
     var tags = ["h2", "h3", "h4", "h5", "h6"];
     var headings = [];
@@ -455,7 +441,6 @@ if (path === "/index.html" || path === "/") {
     elem.style.display = "none";
 } else {
     _updatePathNavigation();
-    _updateApacheNavigation();
     _updateHeadingSelection();
     _addHeadingAnchors();
     _focusJiraSearchForm();
diff --git a/input/images/asf-logo.svg b/input/images/asf-logo.svg
new file mode 100644
index 0000000000..f1084dfb36
--- /dev/null
+++ b/input/images/asf-logo.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 525">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #7c297d;
+      }
+
+      .cls-2 {
+        fill: #f79a23;
+      }
+
+      .cls-3 {
+        fill: #dd552c;
+      }
+
+      .cls-4 {
+        fill: #d22128;
+      }
+    </style>
+  </defs>
+  <g>
+    <g>
+      <path class="cls-1" d="M458.8041825,181.7454822h49.0451573l87.4128103,220.0939304h-53.4548455l-14.7775045-38.0445002h-87.4060779l-15.0939249,38.0445002h-53.1384251l87.4128103-220.0939304ZM514.4537735,324.4914631l-31.1236462-80.4919562-30.8139581,80.4919562h61.9376043Z"/>
+      <path class="cls-1" d="M622.7166664,331.7220052h48.7354693c.3164204,21.0655178,16.0364536,33.3318564,40.2459781,33.3318564,20.7490974,0,33.9579648-8.4894912,33.9579648-23.2669957,0-15.4103452-14.1513961-24.5259448-45.2750423-31.4467989-51.5697879-10.6909691-76.0957328-32.0661749-76.0957328-68.2256176,0-39.9295577,31.7564869-64.7719229,82.3837461-64.7719229,52.189164,0,85.5210204,28.2960599,85.5210204,72.6285734h-48.1093609c0-19.8065687-13.8349757-31.7564869-36.7855511-31.7564869-21.0655178,0-33.9579648,8.8059116-33.9579648,23.2669957,0,13.5252877,11.6334979,22.0147789,45.2750423,29.8714294,54.7137946,12.892447,77.6643699,33.6415444,77.6643699,68.542038,0,41.5049272-32.0729073,66.3472924-84.2620713,66.3472924-55.339903,0-89.2978678-28.9289006-89.2978678-74.5203633Z"/>
+      <path class="cls-1" d="M852.9091193,181.7454822h137.7169167v45.2750423h-87.7224983v55.0234826h79.8591155v44.0228255h-79.8591155v75.7725801h-49.9944184v-220.0939304Z"/>
+    </g>
+    <g>
+      <path class="cls-3" d="M141.1077177,209.8881008c13.1869872-32.608129,27.9005344-65.1523006,43.6878912-93.9970469-23.5665852-17.5041056-46.1956909-55.2490163-55.4930639-71.9721694-3.3392448,3.7936783-5.5070609,8.1629723-6.4899838,11.7176522-8.7587851,31.6252061,22.4204029,69.8144518-2.6929393,55.86166-20.9241385-11.6267655-68.040478-37.0885068-86.0124818-11.7816095,20.1280383,25.862316,72.7733189,90.9304622,107.0005776,110.1715137Z"/>
+      <path class="cls-2" d="M184.7956089,115.8910539c15.2975784-27.9493439,31.5999598-52.4281623,48.5015202-70.0635487,0,0-16.8578001,24.4013964-40.9360438,73.180626,14.5822664,4.0158458,56.1124399,12.2562401,113.9601427-2.686207,1.4222086-10.5125619-5.645074-22.0753701-40.8636711-25.9464703-22.9926525-2.5246306,27.5975787-54.9023003-9.0516423-79.6739759-1.1832102-.8011494-2.3462234-1.508046-3.4856733-2.1408868-1.2286536-.4409688-2.5263137-.8449097-3.9114944-1.2050903-42.8025874-11.1689658-48.7354693,61.409115-65.8154369,45.8068978-27.6009449-25.2126444-45.0225792-19.3218396-53.890765-9.2435142,9.297373,16.7231532,31.9264787,54.4680639,55.4930639,71.9721694Z"/>
+      <path class="cls-4" d="M106.6818547,303.8380213c9.6626029-28.9457315,21.2860022-61.4663399,34.425863-93.9499204-34.2272587-19.2410514-86.8725393-84.3091977-107.0005776-110.1715137-3.5933909,5.0559936-6.0490149,12.1081284-6.8669953,21.7522173-4.3894911,51.802054,49.0518897,90.152876,38.3979485,97.1578844-14.0924881,9.2670774-42.1411341-22.2605096-53.19565-2.2284073,16.0229889,20.5841549,48.6614135,57.7770131,94.2394114,87.4397396Z"/>
+      <path class="cls-3" d="M254.7564893,192.1180675c-27.0589909-9.6508213,28.2758628-35.5333343,46.2445004-62.9912168,2.2990969-3.5109196,4.6756159-8.0485224,5.3202382-12.8049265-57.8477027,14.942447-99.3778763,6.7020527-113.9601427,2.686207-12.4649429,25.2564046-26.8587035,57.0835812-41.8701571,95.4579665,15.6341958,6.6852219,79.4703224,31.3794754,169.6366631,31.50739,15.1595653-39.4852227-39.6905594-44.6994265-65.3711019-53.8554202Z"/>
+      <path class="cls-4" d="M117.1371916,309.0488589c15.9001236,4.9550083,68.5841152,19.7560761,124.5366618,17.5276688,7.5166669-20.3518889-20.585838-22.3379316-22.8748364-38.6605101-1.7722907-12.6298854,73.9565291,10.6135471,98.3225807-35.3111668,1.2320197-2.3226602,2.1930625-4.5140395,3.0059935-6.6313631-90.1663407-.1279146-154.0024672-24.8221682-169.6366631-31.50739-10.9703615,28.0435968-22.2554604,59.5173251-33.3537365,94.5827612Z"/>
+      <path class="cls-1" d="M117.1371916,309.0488589c-7.1447046,22.5701977-14.1934733,46.6821031-21.0352222,72.1640414-2.4270116,9.0348114-4.8254106,18.2379315-7.190148,27.6430221,53.1064464,17.531035,102.0085414.0403941,103.6663821-21.6377674.0134647-.1716749-.018514-.2995895-.0084154-.464532,1.2639984-22.9606739-33.150083-10.2331694-32.3354689-24.0378496.8179803-13.9056654,60.0811593-.0807882,78.4082944-29.8949926,1.4053777-2.2856322,2.3209771-4.3154353,3.0312398-6.244253-55.9525467,2.2284073-108.6365383-12.5726604-124.5366618-17.5276688Z"/>
+      <path class="cls-1" d="M12.4424433,216.3982816c-.7742201,1.4036946-1.4727012,3.0261906-2.068514,4.9651069-10.2920775,33.4496725,62.4846076,78.3847312,52.5830064,88.180298-8.9254108,8.8261086-20.5572255-11.3440069-34.9004936-3.0127259-1.5720033.9155994-3.1675699,2.0701971-4.8052136,3.749918-16.2215932,16.6188018-.2541461,64.4958967,45.7698699,90.0518908-10.7397786,36.0618236-21.4324308,76.351562-31.8995493,118.4859638,3.7970444-1.3296388,8.3413795-2.6626438,9.4724141-6.244253,1.6982349-6.9814452,12.1939658-49.4625629,29.2352225-107.0948305,0,0,3.1103449-11.8051727,8.8042285-31.254927,5.2646964-17.9854685,12.7460184-42.5147795,22.0484407-70.3867014-45.577998-29.6627266-78.2164225-66.8555847-94.2394114-87.4397396Z"/>
+    </g>
+  </g>
+  <g>
+    <polygon class="cls-1" points="404.1671788 144.7351535 413.43089 144.7351535 413.43089 82.5349876 436.7786739 82.5349876 436.7786739 73.4732468 380.8193949 73.4732468 380.8193949 82.5349876 404.1671788 82.5349876 404.1671788 144.7351535"/>
+    <polygon class="cls-1" points="464.8525663 112.9584696 501.321697 112.9584696 501.321697 144.7351535 510.6796611 144.7351535 510.6796611 73.4732468 501.321697 73.4732468 501.321697 103.8899964 464.8525663 103.8899964 464.8525663 73.4732468 455.5955874 73.4732468 455.5955874 144.7351535 464.8525663 144.7351535 464.8525663 112.9584696"/>
+    <polygon class="cls-1" points="581.40298 135.9629037 546.2331925 135.9629037 546.2331925 112.8574844 577.8213707 112.8574844 577.8213707 104.0852345 546.2331925 104.0852345 546.2331925 82.1512438 580.3392689 82.1512438 580.3392689 73.4732468 536.9762136 73.4732468 536.9762136 144.7351535 581.40298 144.7351535 581.40298 135.9629037"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/input/site.css b/input/site.css
index bb46938405..c64608a9a5 100644
--- a/input/site.css
+++ b/input/site.css
@@ -395,9 +395,12 @@ div.imageblock div.content img {
     display: inline;
 }
 
-#-apache-feather {
-    display: inline;
-    vertical-align: -0.07em;
+#-asf-logo {
+    display: inline-block;
+    width: auto;
+    height: 2em;
+    margin: 0 0 0 0.75em;
+    vertical-align: middle;
 }
 
 #-legal {