You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2021/04/07 20:18:58 UTC

[activemq-website] branch master updated: Clarity update

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

jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
     new f0187a0  Clarity update
f0187a0 is described below

commit f0187a0f2e53ba154e93a5109f74967425370a7b
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Wed Apr 7 15:11:42 2021 -0500

    Clarity update
    
    This commit mainly focuses on clarifying & correcting the website in a handful
    of different areas, e.g.:
    
     - Updating the Copyright date in the footer
     - Removing irrelevant, outdated, or redundant pages
     - Fixing broken links where possible & removing defunct ones
     - Consolidating community-related text from many pages into specific,
       comprehensive pages (e.g. the new "Contribute", "Contact Us", & "Report
       Issues" pages)
     - Clarifying menu text
     - Replacing 'ActiveMQ 5' with 'ActiveMQ "Classic"' in some places so that the
       version number isn't tied so closely with the code-base. This was raised on
       the dev list as a pain point if a new major version of "Classic" is
       released.
     - Correcting a handful of visual issues in particular the way configuration
       parameters were being wrapped in tables which made them hard to read
---
 README.md                                          |  11 +-
 src/40-rc-1-guide.md                               |   2 +-
 src/_includes/footer.html                          |   2 +-
 src/_includes/nav.html                             |  14 +-
 src/activemq-3-networks-of-brokers.md              |  13 --
 src/activemq-3-transport-configurations.md         |   5 +-
 src/activemq-artemis-roadmap.md                    |  25 ++-
 src/activemq6.md                                   |  12 --
 src/activemqdtd.md                                 |   3 -
 src/activesoap.md                                  |  40 -----
 src/activespace.md                                 |  10 --
 src/all-forums.md                                  |  12 --
 src/articles.md                                    | 179 ++++++++-------------
 src/banner.md                                      |  10 --
 src/becoming-a-committer.md                        |  50 ------
 src/books.md                                       |   6 +-
 src/can-i-get-commercial-support.md                |  14 --
 src/community.md                                   |  12 --
 src/components/classic/index.md                    |   6 +-
 src/configuration.md                               |  27 ----
 src/contact.md                                     |  41 +++++
 src/contact/index.md                               |  86 ----------
 src/contributing.md                                | 114 ++++---------
 src/css/bootstrap/_code.scss                       |   2 +-
 src/css/main.scss                                  |  34 ++--
 src/cvs.md                                         |  42 -----
 src/developer-forum.md                             |  12 --
 src/developers.md                                  |   2 +-
 src/developing-activemq.md                         |  17 --
 src/discussion-forums.md                           |  23 ---
 src/errors.md                                      |  44 -----
 src/exceptions.md                                  |  26 ---
 src/faq.md                                         |  13 +-
 src/general.md                                     |  37 -----
 src/getting-started-3x.md                          |   4 +-
 src/getting-started.md                             |   4 +-
 src/gettingstarted3x.md                            |  10 --
 src/how-can-i-contribute.md                        | 101 ------------
 src/how-can-i-get-help.md                          |  54 -------
 src/how-do-i-edit-the-website.md                   |  13 --
 src/how-does-activemq-compare-to-jbossmq.md        |   2 +-
 src/how-does-activemq-compare-to-spread-toolkit.md |   2 +-
 src/how-does-the-website-work.md                   |  19 ---
 src/how-fast-is-activemq.md                        |   2 +-
 src/how-you-can-help-release.md                    |   2 +-
 ...-am-not-receiving-any-messages-what-is-wrong.md |   2 +-
 src/index.html                                     |  12 +-
 src/irc.md                                         |  20 ---
 src/issues.md                                      |  65 ++++++++
 src/jdbc-support.md                                |   2 +-
 src/jms.md                                         |  31 ----
 src/mailing-lists.md                               |  10 --
 src/navigation.md                                  |  11 --
 src/old-links.md                                   |  21 ---
 src/performance-report.md                          |   2 +-
 src/performance-tuning.md                          |   2 +-
 src/performance.md                                 |   2 +-
 src/persistence-questions.md                       |  22 ---
 src/previous-versions.md                           |   6 +-
 src/projects-using-activemq.md                     |  28 ++--
 src/running-a-3x-broker.md                         |   5 +-
 src/security-advisories-apollo.md                  |   2 +-
 src/security-advisories.md                         |  25 +--
 src/seda.md                                        |   2 +-
 src/site.md                                        |  16 --
 src/sitemap.md                                     |  32 +---
 src/source.md                                      |   8 +-
 src/support.md                                     |  56 -------
 src/team.md                                        | 159 ------------------
 src/terminology.md                                 | 103 ------------
 src/tips-for-getting-help.md                       |  22 ---
 src/user-forum.md                                  |  12 --
 src/users.md                                       |  26 ---
 src/using-activemq-5.md                            |   2 +-
 src/using-apache-activemq.md                       |  73 ---------
 75 files changed, 303 insertions(+), 1635 deletions(-)

diff --git a/README.md b/README.md
index 63f232a..6ea9c55 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,9 @@ If you would like to make a change to the ActiveMQ site:
 
 If you are a committer, do the following:
 
-1. Update the `master` branch with your (or a Pull Request's) changes.
-2. Run `serve.sh`/ `build.sh`and very the updates made look appropriate.
-3. Push the changes to the ASF remote.
-4. The CI build will run and commit the generated site to the `asf-site` branch automatically within a few minutes, from where it will also be published. CI build status mails go to the commits list.
-4. Verify the updated website works as expected by browsing it.
+1. Clone `https://gitbox.apache.org/repos/asf/activemq-website.git`.
+2. Update the `master` branch with your (or a Pull Request's) changes.
+3. Run `serve.sh` or `build.sh`and verify the updates look appropriate.
+4. Push the changes to the ASF remote.
+5. The CI build will run and commit the generated site to the `asf-site` branch automatically within a few minutes, from where it will also be published. CI build status mails go to the commits list.
+6. Verify the updated website works as expected by browsing it.
diff --git a/src/40-rc-1-guide.md b/src/40-rc-1-guide.md
index 0c22ccc..0c7cb1f 100644
--- a/src/40-rc-1-guide.md
+++ b/src/40-rc-1-guide.md
@@ -40,7 +40,7 @@ Issues Resolved for this Release
 How to Help
 -----------
 
-Everyone in the ActiveMQ community can help with releases; users, developers, commmiters are all encouraged to test out a release and post any comments to the [activemq-dev@ mailing list](mailing-lists) or create a [JIRA](https://issues.apache.org/activemq/browse/AMQ) issue.
+Everyone in the ActiveMQ community can help with releases; users, developers, commmiters are all encouraged to test out a release and post any comments to the [activemq-dev@ mailing list](contact#mailing) or create an [issue](issues).
 
 ActiveMQ is available in both source and binary distributions. See [Getting Started](getting-started).
 
diff --git a/src/_includes/footer.html b/src/_includes/footer.html
index a0c4e85..0489b65 100644
--- a/src/_includes/footer.html
+++ b/src/_includes/footer.html
@@ -10,7 +10,7 @@
               </div>
             </div>
             <div style="text-align: center; margin-bottom: 0px; margin-top: 30px; font-size: 65%" class="col-sm-6">
-              <p>Apache ActiveMQ, ActiveMQ, ActiveMQ Artemis, Apache, the Apache feather logo, and the Apache ActiveMQ project logo are trademarks of The Apache Software Foundation. Copyright &copy; 2019, The Apache Software Foundation. Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.</p>
+              <p><a href="https://www.apache.org/foundation/marks/list/">Apache, ActiveMQ, Apache ActiveMQ</a>, the Apache feather logo, and the Apache ActiveMQ project logo are trademarks of The Apache Software Foundation. Copyright &copy; 2021, The Apache Software Foundation. Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.</p>
             </div>
             <div class="col-sm-3">
               <div >
diff --git a/src/_includes/nav.html b/src/_includes/nav.html
index 0fb00f3..7c62ab3 100644
--- a/src/_includes/nav.html
+++ b/src/_includes/nav.html
@@ -17,7 +17,7 @@
                         <div class="row">
                             <div class="col-12">
                                 <ul class="multi-column-dropdown">
-                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/components/classic">ActiveMQ 5</a></li>
+                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/components/classic">ActiveMQ "Classic"</a></li>
                                     <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/components/artemis/">ActiveMQ Artemis</a></li>
                                     <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/components/nms">NMS Clients</a></li>
                                     <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/components/cms">CMS Client</a></li>
@@ -27,16 +27,14 @@
                     </ul>
                 </li>
                 <li class="nav-item dropdown">
-                    <a class="nav-link" id="navbarDropdownCommunity" data-target="#" href="" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Contact</a>
+                    <a class="nav-link" id="navbarDropdownCommunity" data-target="#" href="" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Get Involved</a>
                     <ul class="dropdown-menu dropdown-menu-center multi-column columns-1" aria-labelledby="navbarDropdownCommunity">
                         <div class="row">
                             <div class="col-12">
                                 <ul class="multi-column-dropdown">
-                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/contact#mailing">Mailing Lists</a></li>
-                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/contact#chat">Chat</a></li>
-                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/contact#issues">Report Issues</a></li>
-                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/contact#contributing">Contributing</a></li>
-                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/security-advisories.html">Security</a></li>
+                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/contact">Contact Us</a></li>
+                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/contributing">Contribute</a></li>
+                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/issues">Report Issues</a></li>
                                 </ul>
                             </div>
                           </div>
@@ -52,7 +50,7 @@
                                     <li class="nav-item"><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
                                     <li class="nav-item"><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                     <li class="nav-item"><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/security-advisories.html">Security</a></li>
+                                    <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/security-advisories">Security</a></li>
                                     <li class="nav-item"><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
                                     <li class="nav-item"><a class="dropdown-item" href="https://people.apache.org/phonebook.html?pmc=activemq">PMC & Committers</a></li>
                                     <li class="nav-item"><a class="dropdown-item" href="{{site.baseurl}}/team/reports">Board Reports</a></li>
diff --git a/src/activemq-3-networks-of-brokers.md b/src/activemq-3-networks-of-brokers.md
deleted file mode 100644
index a4465f9..0000000
--- a/src/activemq-3-networks-of-brokers.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: default_md
-title: ActiveMQ 3 Networks of Brokers 
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Site](site) > [Old Links](old-links) > [Previous Versions](previous-versions) > [ActiveMQ 3 Networks of Brokers](activemq-3-networks-of-brokers)
-
-Old Link
---------
-
-Please see [Networks of Brokers](networks-of-brokers)
diff --git a/src/activemq-3-transport-configurations.md b/src/activemq-3-transport-configurations.md
index d39c465..01d1c56 100644
--- a/src/activemq-3-transport-configurations.md
+++ b/src/activemq-3-transport-configurations.md
@@ -4,9 +4,6 @@ title: ActiveMQ 3 Transport Configurations
 title-class: page-title-activemq5
 type: activemq5
 ---
-
-[Site](site) > [Old Links](old-links) > [Previous Versions](previous-versions) > [ActiveMQ 3 Transport Configurations](activemq-3-transport-configurations)
-
 Some of the transports support configuration, such as timeout values, maximum retry count and so forth. To configure the transports you can use the URI query syntax. e.g.
 
 If you are using a list of URLs like above with the _list_ and _reliable_ protocols you can wrap the list in parens to be able to configure the list. e.g.
@@ -158,4 +155,4 @@ Same as the List configuration options above - plus
 ### Multicast configuration options
 
 *   timeToLive (int) defaults to 1 so we don't send multicast messages beyond our own local subnet.
-*   loopbackMode (boolean) defaults to false so we don't see our own messages
\ No newline at end of file
+*   loopbackMode (boolean) defaults to false so we don't see our own messages
diff --git a/src/activemq-artemis-roadmap.md b/src/activemq-artemis-roadmap.md
index a58c69b..8c5b185 100644
--- a/src/activemq-artemis-roadmap.md
+++ b/src/activemq-artemis-roadmap.md
@@ -1,22 +1,17 @@
 ---
 layout: default_md
-title: ActiveMQ Artemis Roadmap to 6.0
-title-class: page-title-activemq5
-type: activemq5
+title: Artemis' Roadmap to ActiveMQ <i>Next</i>
+title-class: page-title-main
+type: main
 ---
 
-The goal of this page is to identify the outstanding issues that must be addressed by Artemis in order to achieve some level of feature parity with ActiveMQ 5.x. The overall objective for working toward feature parity between ActiveMQ 5.x and Artemis is for Artemis to eventually become ActiveMQ 6.x. This page exists so that we can work together as a group to achieve this goal. This page does **not** list the features which Artemis has *beyond* what currently exists in ActiveMQ 5.x.
+The goal of this page is to identify the outstanding issues that must be addressed by Artemis in order to achieve feature parity with ActiveMQ "Classic". The overall objective for working toward feature parity between "Classic" and Artemis is for Artemis to eventually become the next major version of ActiveMQ. This page exists so that we can work together as a group to achieve this goal. This page does **not** list the features which Artemis has *beyond* what currently exists in ActiveMQ [...]
 
-> **Work in Progress**
-> 
-> This page is a work in progress and will be updated frequently.
+## Features/Scenarios
 
-Features/Scenarios
-==================
+This section should be used to compare what features from ActiveMQ "Classic" have been implemented in Artemis. Feature items can be listed, with links to JIRA tickets for longer conversation and hashing out specific feature details. This will help us to more clearly track everything that Artemis needs. This list of features was taken from the "Classic" [features page](features).
 
-This section should be used to compare what features from ActiveMQ 5.x have been implemented in Artemis. Feature items can be listed, with links to JIRA tickets for longer conversation and hashing out specific feature details. This will help us to more clearly track everything that Artemis needs. This list of ActiveMQ 5.x features was taken from the [5.x features page](features).
-
-Keep in mind that not every feature must have an &#9989;. Artemis may still be ready to become ActiveMQ 6.0 even if a feature on this page still has an &#10060; if that feature is deemed low priority. Artemis is not meant to be a 100% complete reimplementation of ActiveMQ 5.x. Features should only be reimplimented where it makes good sense.
+Keep in mind that not every feature must have a &#9989;. Artemis may still be ready to become ActiveMQ *Next* even if features on this page still have an &#10060; if those features are deemed low priority. Artemis is not meant to be a 100% complete reimplementation of ActiveMQ "Classic". Features should only be reimplimented where it makes good sense.
 
 ### Protocol Support
 
@@ -95,7 +90,7 @@ Keep in mind that not every feature must have an &#9989;. Artemis may still be r
 |Feature|Artemis Support|JIRA|Notes|
 |---|:---:|---|---|
 |[Async Sends](async-sends)|&#9989;||supported for OpenWire & also for core (via `blockOnDurableSend` and `blockOnNonDurableSend` URL parameters)|
-|[Dispatch Policies](dispatch-policies)|&#10060;|||
+|[Pluggable Dispatch Policies](dispatch-policies)|&#10060;||delay-before-dispatch and consumers-before-dispatch have been implemented|
 |[Message Cursors](message-cursors)|&#9989;||equivalent via [paging](components/artemis/documentation/latest/paging)|
 |[Optimized Acknowledgement](optimized-acknowledgement)|&#9989;||supported for OpenWire & core as well via `ackBatchSize` URL parameter|
 |[Producer Flow Control](producer-flow-control)|&#9989;||[documentation](components/artemis/documentation/latest/flow-control)|
@@ -139,8 +134,8 @@ Keep in mind that not every feature must have an &#9989;. Artemis may still be r
 Migration
 =========
 
-This section should help to answer the end user question, _'How do I migrate from ActiveMQ 5.x to Artemis?'_. This should include the identification of any tools that can help make this easier, as well as documenting information and procedures specific to migrating.
+This section should help to answer the end user question, _'How do I migrate from ActiveMQ "Classic" to Artemis?'_. This should include the identification of any tools that can help make this easier, as well as documenting information and procedures specific to migrating.
 
 * [Migration Guide](components/artemis/migration)
 * Export messages from KahaDB using [this tool](https://github.com/apache/activemq-cli-tools/tree/master/activemq-kahadb-exporter). The exported XML can be imported via the `./artemis data imp` command.
-* For non-standard backends (where direct export isn't an option) follow [this example](https://github.com/apache/activemq-artemis/tree/master/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge) to migrate messages from ActiveMQ 5.x to Artemis over the wire.
+* For non-standard backends (where direct export isn't an option) follow [this example](https://github.com/apache/activemq-artemis/tree/master/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge) to migrate messages from ActiveMQ "Classic" to Artemis over the wire.
diff --git a/src/activemq6.md b/src/activemq6.md
deleted file mode 100644
index 21074c5..0000000
--- a/src/activemq6.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: default_md
-title: ActiveMQ6 
-title-class: page-title-activemq5
-type: activemq5
----
-
-[ActiveMQ6](activemq6)
-
-
-ActiveMQ6 is next Generation ActiveMQ.
-
diff --git a/src/activemqdtd.md b/src/activemqdtd.md
index a908fa5..977e1ac 100644
--- a/src/activemqdtd.md
+++ b/src/activemqdtd.md
@@ -4,9 +4,6 @@ title: activemq.dtd
 title-class: page-title-activemq5
 type: activemq5
 ---
-
-[Site](site) > [Old Links](old-links) > [activemq.dtd](activemqdtd)
-
 We support a custom [Xml Configuration](xml-configuration) mechanism for configuring a Message Broker instance.
 
 To provide tools and IDEs with an easy way of editing the XML as well as providing some handy documentation, we provide our own [activemq.dtd](http://svn.activemq.org/trunk/activemq/modules/core/src/conf/org/activemq/activemq.dtd?view=markup) file which describes all of the various configuration options available.
diff --git a/src/activesoap.md b/src/activesoap.md
deleted file mode 100644
index 1dee55e..0000000
--- a/src/activesoap.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-layout: default_md
-title: ActiveSoap
-title-class: page-title-activemq5
-type: activemq5
---- 
-
-[Site](site.md) > [Old Links](old-links) > [ActiveSoap](activesoap)
-
-The idea is to provide a really simple & lightweight SOAP stack which can be extended & connected to any transport and binding technology.
-
-### Pluggable transports
-
-With ActiveMQ we've got most common transports covered (TCP, SSL, UDP, multicast, JGroups, JRMS, JXTA, NIO, AIO, Discovery (Zeroconf/ ActiveCluster), reliable transports etc).
-
-Future protocols could be SOAP-over-TCP, SOAP-over-Jabber, FTP / SMTP / file polling etc.
-
-However we should support any kind of transport using any kind of library - since mostly all a transport does is expose a 'packet' which is just a blob of bytes, a String or a stream.
-
-### Marshalling layers
-
-If we then pass data from the transports into a pluggable connector layer which could consist of either
-
-*   XMLBeans direct
-*   JAXB
-*   StAX, SAX, DOM, Source (TrAX processing)
-*   JAX-RCP endpoints & Axis handlers
-*   XStream etc
-*   custom parsing / marshalling tools
-
-Then we can make a highly scalable & performing SOAP stack using any marshalling code required - without having to pay the DOM price.
-
-### Custom endpoints
-
-There are various possible ultimate endpoints, from Axis stuff to POJOs to JWS and the like - these should all drop into one of the marshalling technologies - use the most efficient one for the endpoint technology you wish.
-
-Issues
-------
-*   we need a simple way to write reuable header processors. I suspect writing StAX based ones is gonna be the best way forwards as it makes writing header-based pipeline processors the easiest. But we should make this pluggable.
-*   is XMLBeans definitely the fastest stack we can use? XStream is pretty fast though its java centric rather than XSD centric (but maybe thats a good thing
diff --git a/src/activespace.md b/src/activespace.md
deleted file mode 100644
index 73b44d8..0000000
--- a/src/activespace.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: default_md
-title: ActiveSpace
-title-class: page-title-activemq5
-type: activemq5
----  
-
-[Site](site.md) > [Old Links](old-links) > [ActiveSpace](activespace)
-
-**Note** that the ActiveSpace documentation has now has moved [to its own wiki](http://docs.codehaus.org/display/AS/Home)
diff --git a/src/all-forums.md b/src/all-forums.md
deleted file mode 100644
index 7236df6..0000000
--- a/src/all-forums.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: default_md
-title: All Forums 
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Community](community) > [Mailing Lists](mailing-lists) > [All Forums](all-forums)
-
-
-[ActiveMQ](http://www.nabble.com/ActiveMQ-f2354.html)
-
diff --git a/src/articles.md b/src/articles.md
index 78ad515..747c42e 100644
--- a/src/articles.md
+++ b/src/articles.md
@@ -7,121 +7,82 @@ type: activemq5
 
 [Community](community) > [Articles](articles)
 
-
 This page captures resources and articles outside the ActiveMQ project which may assist your development. Please add any new resources that you come across by clicking the edit link at the bottom of the page. If you do this, please make sure to attach a date to the article as well so users are aware of how recent it is.
 
-### Interviews and Podcasts
-
-*   [ActiveMQ FeatherCast](http://feathercast.org/?p=42), James Strachan is interviewed on the ActiveMQ project
+#### Interviews and Podcasts
 
-### Webinars, Videos and Screencasts
+* [ActiveMQ FeatherCast](https://feathercast.apache.org/2007/04/02/episode-27-apache-activemq/), James Strachan is interviewed on the ActiveMQ project
 
-*   [Apache ActiveMQ - Connecting Applications everywhere](http://download.progress.com/5331/open/adobe/prc/psc/perf_tuning_activemq/index.htm) by _[Rob Davies](http://rajdavies.blogspot.com/)_
-*   [Performance Tuning ActiveMQ webinar](http://download.progress.com/5331/open/adobe/prc/psc/perf_tuning_activemq/index.htm) _by [Rob Davies](http://rajdavies.blogspot.com/)_
-*   [FuseSource Webinars](http://fusesource.com/resources/video-archived-webinars/) - Upcoming and archived webinars on Apache ActiveMQ and other related Apache products.
-*   [FuseSource TV](http://fusesource.com/resources/fuse-tv/) - webcasts about Apache ActiveMQ and related Apache projects.
+#### Webinars, Videos and Screencasts
 
-### Articles on ActiveMQ, Messaging and JMS
+* [Apache ActiveMQ - Connecting Applications everywhere](https://www.slideshare.net/rajdavies/connecting-applications-eve) by _[Rob Davies](http://rajdavies.blogspot.com/)_
 
 #### General Articles
 
-*   [Connecting to ActiveMQ with Payara Server](http://blog.payara.fish/connecting-to-activemq-with-payara-server) by Steve Millidge (December, 2015)
-*   [Messaging for Web and Mobile with Apache ActiveMQ](http://de.slideshare.net/dejanb/messaging-for-web-and-mobile-with-apache-activemq) by [Dejan Bosanac](http://Dejan Bosanac) (June, 2013)
-*   [ActiveMQ in Action: Common Problems and Solutions](http://de.slideshare.net/bruce.snyder/activemq-in-action) by Bruce Snyder (July, 2011)
-*   [Accessing ActiveMQ on Mac OSX from a Windows VM](http://blog.phatboyg.com/2009/07/12/accessing-activemq-on-mac-osx-from-a-windows-vm/)
-*   [Flex with JMS using BlazeDS, Jetty and ActiveMQ](http://www.theserverlabs.com/blog/2009/01/22/flex-with-jms-using-blazeds-jetty-and-activemq/) _by Kevin McCormack_ (January, 2009)
-*   [Mutual SSL authentication and LDAP authorisation for ActiveMQ](http://christopherhunt-software.blogspot.com/2009/03/mutual-ssl-authentication-and-ldap.html) _by [Christopher Hunt](http://christopherhunt-software.blogspot.com)_ (March, 2009)
-*   [Made of Messages](http://www.slideshare.net/carsonified/dopplr-its-made-of-messages-matt-biddulph-presentation) _by Matt Biddulph of [Dopplr](http://www.dopplr.com/)_
-*   [Simplified BlazeDS and JMS article](http://mmartinsoftware.blogspot.com/2008/05/simplified-blazeds-and-jms.md) _by [Michael Martin](http://mmartinsoftware.blogspot.com/)_ (May, 2008)
-*   [Trying out XA](http://ourcraft.wordpress.com/2008/07/03/trying-out-xa/) with ActiveMQ _by Daniel Meyer_ (July, 2008)
-*   [Squawk (simple queues using awk)](http://latrz.com/2586) _by [Andrew Birkett](http://www.nobugs.org/blog/)_
-*   [Using ActiveMQ and REST](http://p-st.blogspot.com/2007/12/activemq-and-rest.md) _by [marlet](http://p-st.blogspot.com/)_ (December, 2007)
-*   [Apache ActiveMQ and Perl](http://esammer.blogspot.com/2007/09/apache-activemq-and-perl.md) (September, 2007)
-*   [Publish-Subscribe with ActiveMQ and NMS](http://remark.wordpress.com/articles/publish-subscribe-with-activemq-and-nms/)
-*   [ActiveMQ Master/Slave Setup](http://note19.com/2007/06/24/activemq-masterslave-setup/)
-*   [GlassFish and ActiveMQ](http://weblogs.java.net/blog/rampsarathy/archive/2007/03/glassfish_v2_an.html) _by Ramesh Parthasarathy_ (March, 2007)
-*   [Asynchronous calls and callbacks with Lingo and ActiveMQ](http://jroller.com/page/sjivan?entry=asynchronous_calls_and_callbacks_using) _by Sanjiv Jivan_ (May, 2006)
-*   [Magic with JMS, MDBs, and ActiveMQ in Geronimo](http://www-128.ibm.com/developerworks/opensource/library/os-ag-jmsbeans/) _by Sing Li_ (July, 2005)
-*   [Implementing Request-Response with ActiveMQ and NMS](http://remark.wordpress.com/articles/implementing-request-response-with-activemq-and-nms/) _by Mark_
-*   [Understanding Memory Usage](http://www.christianposta.com/blog/?p=273) _by Christian Posta_ gives an overview and dive into the memory usage of the broker.
-
-#### ActiveMQ Maintenance and Monitoring
-
-*   [Running ActiveMQ and hawtio in Standalone Mode](http://www.bennet-schulz.com/2016/07/apache-activemq-and-hawtio.html) by [Bennet Schulz](https://twitter.com/bennetelli) (July, 2016)
-*   [Management and monitoring ActiveMQ using hawtio](http://sensatic.net/activemq/activemq-and-hawtio.html) (how to install hawtio out of  the box in ActiveMQ) by Dejan Bosanac (April 2014)
-*   [Monitoring ActiveMQ from Nagios](http://it.toolbox.com/blogs/unix-sysadmin/monitoring-activemq-from-nagios-27743) _by [Cezary Morga](http://it.toolbox.com/people/therek/)_
-*   [Use JConsole with ActiveMQ for a quick JMS test client](http://soatechlab.blogspot.com/2008/01/use-jconsole-with-activemq-for-quick.html) _by [Rod Biresch](http://soatechlab.blogspot.com/)_ (January 2008)
-*   [Integrating ActiveMQ Web Console](http://www.oreillynet.com/onjava/blog/2007/06/integrating_activemq_web_conso.html) _by [Dejan Bosanac](http://www.oreillynet.com/pub/au/1763)_ (June 2007)
-*   [Hermes Message Stores with ActiveMQ demo](http://hermesjms.com/demos/messagestores.html) _by Colin Crist_
-
-#### ActiveMQ and Databases
-
-*   [High Availability ActiveMQ using MySQL and Ruby](http://barkingiguana.com/2008/12/16/high-availability-activemq-using-a-mysql-datastore) _by [Craig R Webster](http://barkingiguana.com/)_ (December 2008)
-*   [Setting up a PostgreSQL database for ActiveMQ](http://trenaman.blogspot.com/2008/09/setting-up-postgresql-database-for.html) _by [Adrian Trenaman](http://trenaman.blogspot.com/)_ (September 2008)
-*   [Configure ActiveMQ with MySQL](http://note19.com/2007/06/23/configure-activemq-with-mysql/) _By Shahram Javey_ (June 2007)
-
-#### ActiveMQ and Spring
-
-*   [Spring JMS Examples with ActiveMQ](https://github.com/bsnyder/spring-jms-examples) by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (June 2011)
-*   [Tuning JMS Message Consumption In Spring](https://bsnyderblog.blogspot.com/2010/05/tuning-jms-message-consumption-in.html) by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (May 2010)
-*   [Synchronous Request Response with ActiveMQ and Spring](https://medium.com/@bdarfler/synchronous-request-response-with-activemq-and-spring-21359a438a86) _by [CodeDependents](http://codedependents.com/)_ (March 2010)
-*   [Using Spring to Receive JMS Messages](https://bsnyderblog.blogspot.com/2010/02/using-spring-to-receive-jms-messages.html) by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (February 2010)
-*   [Using Spring to Send JMS Messages](https://bsnyderblog.blogspot.com/2010/02/using-spring-jmstemplate-to-send-jms.md) by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (February 2010)
-*   [Efficient Lightweight JMS with Spring and ActiveMQ](https://medium.com/@bdarfler/efficient-lightweight-jms-with-spring-and-activemq-51ff6a135946) _by [CodeDependents](http://codedependents.com/)_ (Octover 2009)
-*   [ActiveMQ Message Consumer in Spring](http://javaandjava.blogspot.com/2008/10/activemq-message-consumer-in-spring.html) _by [Saveen Kumar](http://javaandjava.blogspot.com/)_ (October 2008)
-*   [Message-Driven Architectures at The Spring Experience](http://www.springframework.org/node/527) _by Keith Donald_ (September 2007)
-
-#### ActiveMQ with JRuby/Ruby, Rails and/or Stomp
-
-*   [JRuby JMS as a replacement for ActiveMessaging](http://beechbonanza.blogspot.com/2007/07/jruby-jms-as-replacement-for.html)
-*   [JMS with JRuby and ActiveMQ](http://nutrun.com/weblog/jms-with-jruby-and-activemq/)
-*   [First Steps on Ruby/STOMP and ActiveMQ](http://romjethoughts.blogspot.com/2007/05/first-steps-with-rubystomp-and-activemq.html) _by [jerome moliere](http://romjethoughts.blogspot.com/)_
-*   [Asynchronous Messaging with Rails](http://beechbonanza.blogspot.com/2007/06/asynchronous-messaging-with-rails.html) _by [Shane Harvie](http://beechbonanza.blogspot.com/)_
-*   [Integrating Rails and ActiveMQ with ActiveMessaging/REST](http://notdennisbyrne.blogspot.com/2007/06/integrating-rails-and-activemq-with.html) _by [(not) Dennis Byrne](http://notdennisbyrne.blogspot.com/)_
-*   [Asynchronous Messaging using Rails](http://ramesh-rubyonrails.blogspot.com/2007/09/asynchronous-messaging-using-rails.html)
-*   [Introduction to ActiveMessaging, using Rails with ActiveMQ or Stomp](http://www.infoq.com/articles/intro-active-messaging-rails) _by Andrew Kuklewicz_
-*   [Flex, Rails, ActiveMQ and Stomp](http://flexonrails.net/?p=83) _by [Flex On Rails](http://flexonrails.net)_
-*   [ActiveMQ stomp end to end test for nagios](http://just-another.net/2008/09/03/activemq-stomp-end-end-test-nagios/) _by [Benjamin Smith](http://just-another.net/)_
-*   [How to Create a Stomp-Driven Application in JavaScript Using Apache ActiveMQ as a Message Broker](http://www.kaazing.org/confluence/display/Doc/JavaScript+STOMP+Client+How-To) _by [Kaazing](http://www.kaazing.org/confluence/display/KAAZING/Home)_
-*   [Scalable Real-Time Web Architecture, Part 1: Stomp, Comet, and Message Queues](http://cometdaily.com/2008/10/08/scalable-real-time-web-architecture-part-1-stomp-comet-and-message-queues/) _by [Michael Carter](http://cometdaily.com/people/michael_carter/)_
-
-#### ActiveMQ and .NET
-
-*   [Messaging with .NET and ActiveMQ](http://remark.wordpress.com/articles/messaging-with-net-and-activemq/) _by [Re.Mark](http://remark.wordpress.com/)_
-*   [Using .Net and ActiveMQ](http://remark.wordpress.com/articles/messaging-with-net-and-activemq/) _by [Re.Mark](http://remark.wordpress.com/)_
-
-### Message Broker Comparison
-
-*   [RabbitMQ vs Apache ActiveMQ vs Apache qpid](http://bhavin.directi.com/rabbitmq-vs-apache-activemq-vs-apache-qpid/) _by Bhavin Turakhia_ (May, 2010)
-*   [Python messaging: ActiveMQ and RabbitMQ](http://www.nighttale.net/activemq/python-messaging-activemq-and-rabbitmq.html) _by Night Tale_
-*   [Multicasting, Messaging, ActiveMQ vs. MSMQ?](http://stackoverflow.com/questions/32851/multicasting-messaging-activemq-vs-msmq) _by stackoverflow.com_
-*   [JMS Performance Comparison](http://www.fiorano.com/whitepapers/java-message-service/JMS-performance-comparison.php) _by www.fiarano.com_
-*   [How does ActiveMQ compare to JBossMQ](http://activemq.apache.org/how-does-activemq-compare-to-jbossmq.md)
-*   [Why use ActiveMQ over JBossMQ?](http://www.mail-archive.com/activemq-users@geronimo.apache.org/msg05630.html)
-*   [Thread: ActiveMQ vs Websphere MQ](http://www.manning-sandbox.com/thread.jspa?threadID=39270&tstart=45)
-*   [How does ActiveMQ compare to Mule?](http://activemq.apache.orgCommunity/FAQ/GeneralCommunity/FAQ/General/Community/FAQ/General/how-does-activemq-compare-to-mule.md)
-*   [HornetQ 2.0GA vs ActiveMQ 5.3 – feature by feature comparison](http://www.roklee.com/?p=52) _by www.roklee.com_
-*   [Performance and scalability: Analysis and comparison of ActiveMQ, Websphere MQ and SonicMQ](http://www.theserverside.com/discussions/thread.tss?thread_id=57192)
-*   [ActiveMQ vs. Camel vs. Qpid](http://activemq.2283324.n4.nabble.com/ActiveMQ-vs-Camel-vs-Qpid-td2355914.html)
-
-### ActiveMQ tooling and scripts
-
-*   [Bash-MQ](https://github.com/ebuzzing/bash-mq) - a bash/awk producer/consumer for activemq or any STOMP compatible MQ
-
-### Books and Reference Guides
-
-*   Beside these extract of interviews, articles and videos there are also some books available. Take a look at the [Books](books) page.
-
-### Additional Resources
-
-*   Many of the Commercial Providers listed on the [Support](support) page provide additional examples, articles, tutorials, documentation, etc...
-
-### ActiveMQ bloggers
-
-*   [Rob Davies](http://rajdavies.blogspot.com/)
-*   [Hiram Chirino](http://hiramchirino.com/blog/)
-*   [Gary Tully](http://blog.garytully.com/)
-*   [Dejan Bosanac](http://www.nighttale.net)
-*   [Bruce Snyder](http://bruceblog.org/)
-*   [Christian Posta](http://www.christianposta.com/blog)
+* [Connecting to ActiveMQ with Payara Server](http://blog.payara.fish/connecting-to-activemq-with-payara-server) by Steve Millidge (December, 2015)
+* [Messaging for Web and Mobile with Apache ActiveMQ](http://de.slideshare.net/dejanb/messaging-for-web-and-mobile-with-apache-activemq) by [Dejan Bosanac](http://Dejan Bosanac) (June, 2013)
+* [ActiveMQ in Action: Common Problems and Solutions](http://de.slideshare.net/bruce.snyder/activemq-in-action) by Bruce Snyder (July, 2011)
+* [Mutual SSL authentication and LDAP authorisation for ActiveMQ](http://christopherhunt-software.blogspot.com/2009/03/mutual-ssl-authentication-and-ldap.html) _by [Christopher Hunt](http://christopherhunt-software.blogspot.com)_ (March, 2009)
+* [Made of Messages](http://www.slideshare.net/carsonified/dopplr-its-made-of-messages-matt-biddulph-presentation) _by Matt Biddulph of [Dopplr](http://www.dopplr.com/)_
+* [Publish-Subscribe with ActiveMQ and NMS](http://remark.wordpress.com/articles/publish-subscribe-with-activemq-and-nms/)
+* [Implementing Request-Response with ActiveMQ and NMS](http://remark.wordpress.com/articles/implementing-request-response-with-activemq-and-nms/) _by Mark_
+* [Understanding Memory Usage](https://blog.christianposta.com/activemq/activemq-understanding-memory-usage/) _by Christian Posta_ gives an overview and dive into the memory usage of the broker.
+
+#### Maintenance and Monitoring
+
+* [Running ActiveMQ and hawtio in Standalone Mode](http://www.bennet-schulz.com/2016/07/apache-activemq-and-hawtio.html) by [Bennet Schulz](https://twitter.com/bennetelli) (July, 2016)
+* [Management and monitoring ActiveMQ using hawtio](http://sensatic.net/activemq/activemq-and-hawtio.html) (how to install hawtio out of  the box in ActiveMQ) by Dejan Bosanac (April 2014)
+* [Use JConsole with ActiveMQ for a quick JMS test client](http://soatechlab.blogspot.com/2008/01/use-jconsole-with-activemq-for-quick.html) _by [Rod Biresch](http://soatechlab.blogspot.com/)_ (January 2008)
+
+#### Database 
+
+* [High Availability ActiveMQ using MySQL and Ruby](http://barkingiguana.com/2008/12/16/high-availability-activemq-using-a-mysql-datastore) _by [Craig R Webster](http://barkingiguana.com/)_ (December 2008)
+* [Setting up a PostgreSQL database for ActiveMQ](http://trenaman.blogspot.com/2008/09/setting-up-postgresql-database-for.html) _by [Adrian Trenaman](http://trenaman.blogspot.com/)_ (September 2008)
+
+#### Spring
+
+* [Spring JMS Examples with ActiveMQ](https://github.com/bsnyder/spring-jms-examples) by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (June 2011)
+* [Tuning JMS Message Consumption In Spring](https://bsnyderblog.blogspot.com/2010/05/tuning-jms-message-consumption-in.html) by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (May 2010)
+* [Synchronous Request Response with ActiveMQ and Spring](https://medium.com/@bdarfler/synchronous-request-response-with-activemq-and-spring-21359a438a86) _by [CodeDependents](http://codedependents.com/)_ (March 2010)
+* [Using Spring to Receive JMS Messages](https://bsnyderblog.blogspot.com/2010/02/using-spring-to-receive-jms-messages.html) by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (February 2010)
+* [Using Spring to Send JMS Messages](https://bsnyderblog.blogspot.com/2010/02/using-spring-jmstemplate-to-send-jms.html) by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (February 2010)
+* [Efficient Lightweight JMS with Spring and ActiveMQ](https://medium.com/@bdarfler/efficient-lightweight-jms-with-spring-and-activemq-51ff6a135946) _by [CodeDependents](http://codedependents.com/)_ (Octover 2009)
+* [ActiveMQ Message Consumer in Spring](http://javaandjava.blogspot.com/2008/10/activemq-message-consumer-in-spring.html) _by [Saveen Kumar](http://javaandjava.blogspot.com/)_ (October 2008)
+
+#### JRuby/Ruby, Rails and/or Stomp
+
+* [Introduction to ActiveMessaging, using Rails with ActiveMQ or Stomp](http://www.infoq.com/articles/intro-active-messaging-rails) _by Andrew Kuklewicz_
+
+#### .NET
+
+* [Messaging with .NET and ActiveMQ](http://remark.wordpress.com/articles/messaging-with-net-and-activemq/) _by [Re.Mark](http://remark.wordpress.com/)_
+* [Using .Net and ActiveMQ](http://remark.wordpress.com/articles/messaging-with-net-and-activemq/) _by [Re.Mark](http://remark.wordpress.com/)_
+
+#### Broker Comparison
+
+* [Python messaging: ActiveMQ and RabbitMQ](http://www.nighttale.net/activemq/python-messaging-activemq-and-rabbitmq.html) _by Night Tale_
+* [Multicasting, Messaging, ActiveMQ vs. MSMQ?](http://stackoverflow.com/questions/32851/multicasting-messaging-activemq-vs-msmq) _by stackoverflow.com_
+* [JMS Performance Comparison](https://www.fiorano.com/assets/pdf/whitepaper/jms_performance_comparison.pdf) _by www.fiarano.com_
+* [How does ActiveMQ compare to JBossMQ](http://activemq.apache.org/how-does-activemq-compare-to-jbossmq)
+* [Why use ActiveMQ over JBossMQ?](http://www.mail-archive.com/activemq-users@geronimo.apache.org/msg05630.html)
+* [How does ActiveMQ compare to Mule?](http://activemq.apache.org/how-does-activemq-compare-to-mule)
+* [Performance and scalability: Analysis and comparison of ActiveMQ, Websphere MQ and SonicMQ](http://www.theserverside.com/discussions/thread.tss?thread_id=57192)
+* [ActiveMQ vs. Camel vs. Qpid](http://activemq.2283324.n4.nabble.com/ActiveMQ-vs-Camel-vs-Qpid-td2355914.html)
+
+#### Books and Reference Guides
+
+* Beside these extract of interviews, articles and videos there are also some books available. Take a look at the [Books](books) page.
+
+#### Additional Resources
+
+* Many of the commercial providers listed on the [issues](issues#commercial-support) page provide additional examples, articles, tutorials, documentation, etc...
+
+#### Bloggers
+
+* [Rob Davies](http://rajdavies.blogspot.com/)
+* [Hiram Chirino](http://hiramchirino.com/blog/)
+* [Gary Tully](http://blog.garytully.com/)
+* [Dejan Bosanac](http://www.nighttale.net)
+* [Bruce Snyder](http://bruceblog.org/)
+* [Christian Posta](https://blog.christianposta.com/)
 
diff --git a/src/banner.md b/src/banner.md
deleted file mode 100644
index 53cccdf..0000000
--- a/src/banner.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: default_md
-title: Banner
-title-class: page-title-activemq5
-type: activemq5
---- 
-
-[Site](site) > [Banner](banner)
-
-
diff --git a/src/becoming-a-committer.md b/src/becoming-a-committer.md
deleted file mode 100644
index 0ad0f87..0000000
--- a/src/becoming-a-committer.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-layout: default_md
-title: Becoming a committer 
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Developers](developers) > [Becoming a committer](becoming-a-committer)
-
-
-This page details how to become a committer.
-
-### How to become a committer
-
-First of all you need to get involved and [Contribute](contributing) via the mail list, forums, edit the documention, work on the issue tracker and submit patches.
-
-Once you're contributing and your work is good, one of our [Team](team) may invite you to be a committer (after we've called a vote). When that happens, if you accept, the following process kicks into place...
-
-Note that becoming a committer is not just about submitting some patches; its also about helping out on the development and user [Discussion Forums](discussion-forums), helping with documentation and the issue tracker.
-
-### Becoming a committer steps
-
-*   Download and print the Apache Contributor License Agreement from [here](http://www.apache.org/dev/new-committers-guide.html). You need to sign it and fax it to Apache. In the past I've found its often faster to also post it via snail mail ![(smile)](https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/smile.png)
-*   wait for your name to appear on the list of [received CLAs](http://people.apache.org/~jim/committers.html#unlistedclas)
-*   once thats done let us know and we can apply to Apache Infrastructure to have your account created; we'll also need to know
-    *   your full name
-    *   your preferred email address
-    *   your preferred unix account name
-
-### Getting started at Apache
-
-Firstly add yourself to the [Team](team) page
-
-Now go read the instructions on the [new committers guide](http://www.apache.org/dev/new-committers-guide.html). Its also worth viewing [http://www.apache.org/dev](http://www.apache.org/dev).
-
-### Enabling your GIT account
-
-Once you've got your Apache account working you need to enable GIT access**.** Add your SSH Key at [https://id.apache.org/](https://id.apache.org/)
-
-### Configuring GIT
-
-Configure GIT to use unix line endings.
-```
-git config --add core.autocrlf input
-```
-
-### Getting Karma in JIRA and Confluence
-
-Mail the dev list and ask for karma for JIRA / Confluence giving them details of your username you used to register with them both. We can then grant the necessary karma so you can start grabbing JIRA issues or editing the wiki
-
diff --git a/src/books.md b/src/books.md
index 36d33d5..0215510 100644
--- a/src/books.md
+++ b/src/books.md
@@ -10,7 +10,7 @@ type: activemq5
 Books
 =====
 
-This page lists the known books about Apache ActiveMQ. If you happen to know a book which is not listed then please contact us, for example using the [Mailing Lists](mailing-lists).
+This page lists the known books about Apache ActiveMQ. If you happen to know a book which is not listed then please contact us, for example using the [Mailing Lists](contact#mailing).
 
 *   [ActiveMQ in Action](http://bit.ly/2je6cQ)
 *   [Instant Apache ActiveMQ Messaging Application Development](http://goo.gl/RFltj)
@@ -29,9 +29,9 @@ Along the way, you'll pick up best practices forged out of the deep experience t
 
 ### Instant Apache ActiveMQ Messaging Application Development
 
-[Instant Apache ActiveMQ Messaging Application Development](http://goo.gl/RFltj) by [Timothy Bish](http://timbish.blogspot.com/). Published by [Packt Publishing](http://www.packtpub.com/).
+[Instant Apache ActiveMQ Messaging Application Development](https://subscription.packtpub.com/book/application-development/9781782169413) by [Timothy Bish](http://timbish.blogspot.com/). Published by [Packt Publishing](http://www.packtpub.com/).
 
-[![](http://dgdsbygo8mp3h.cloudfront.net/sites/default/files/imagecache/productview_larger/9413OS.jpg)](http://goo.gl/RFltj)
+[![](https://static.packt-cdn.com/products/9781782169413/cover/smaller)](https://subscription.packtpub.com/book/application-development/9781782169413)
 
 Instant ActiveMQ Application Development How-to is for the developers who are new to Java Message Service application development or new to JMS development using ActiveMQ. Readers will come away ready to solve complicated messaging related problems using the JMS API and ActiveMQ.
 
diff --git a/src/can-i-get-commercial-support.md b/src/can-i-get-commercial-support.md
deleted file mode 100644
index 0599943..0000000
--- a/src/can-i-get-commercial-support.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: default_md
-title: Title
-title-class: page-title-activemq5
-type: activemq5
----
-
-[FAQ](faq) > [JMS](jms) > [Can I get commercial support](can-i-get-commercial-support)
-
-Can I get commercial support?
------------------------------
-
-Absolutely, see our [Support](support) page for more details
-
diff --git a/src/community.md b/src/community.md
index 48a41d1..308e24e 100644
--- a/src/community.md
+++ b/src/community.md
@@ -7,11 +7,9 @@ type: activemq5
 
 [Community](community)
 
-
 *   [Articles](articles)
 *   [Books](books)
 *   [Contributing](contributing)
-*   [Discussion Forums](discussion-forums)
 *   [FAQ](faq)
     *   [Configuration](configuration)
     *   [Developing ActiveMQ](developing-activemq)
@@ -21,19 +19,9 @@ type: activemq5
     *   [Persistence Questions](persistence-questions)
     *   [Terminology](terminology)
     *   [Using Apache ActiveMQ](using-apache-activemq)
-*   [Mailing Lists](mailing-lists)
-    *   [All Forums](all-forums)
-    *   [Developer Forum](developer-forum)
-    *   [User Forum](user-forum)
 *   [PMC Templates](pmc-templates)
 *   [Privacy Policy](privacy-policy)
 *   [Projects Using ActiveMQ](projects-using-activemq)
-*   [Security Advisories](security-advisories)
-*   [Sponsorship](sponsorship)
-*   [Support](support)
-*   [Team](https://people.apache.org/phonebook.html?pmc=activemq)
-*   [Tips for getting help](tips-for-getting-help)
-*   [Users](users)
 
  
 
diff --git a/src/components/classic/index.md b/src/components/classic/index.md
index 24f04f0..7ffc3f6 100644
--- a/src/components/classic/index.md
+++ b/src/components/classic/index.md
@@ -1,7 +1,7 @@
 ---
 layout: project_default_md
-project_name: ActiveMQ 5
-project_info: The Classic Open Source Message Broker
+project_name: ActiveMQ "Classic"
+project_info: The Tried and Trusted Open Source Message Broker
 project_class: activemq5
 project_color: pink
 ---
@@ -10,7 +10,7 @@ Apache ActiveMQ&reg; is the most popular and powerful open source messaging and
 
 Apache ActiveMQ is fast, supports many [Cross Language Clients and Protocols](../../cross-language-clients), comes with easy to use [Enterprise Integration Patterns](../../enterprise-integration-patterns) and many [advanced features](../../features) while fully supporting [JMS 1.1](http://java.sun.com/products/jms/) and J2EE 1.4\. Apache ActiveMQ is released under the [Apache](http://www.apache.org/) [2.0 License](http://www.apache.org/licenses/LICENSE-2.0)
 
-Grab yourself a [Download](../../download), try our [Getting Started Guide](../../getting-started), surf our [FAQ](../../faq) or start [Contributing](../../contributing) and join us on our [Discussion Forums](../../discussion-forums).
+Grab yourself a [download](../../download), review our [Getting Started Guide](../../getting-started), surf our [FAQ](../../faq), or start [contributing](../../contributing).
 
 ---
 
diff --git a/src/configuration.md b/src/configuration.md
deleted file mode 100644
index cfa96d7..0000000
--- a/src/configuration.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-layout: default_md
-title: Configuration 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [Configuration](configuration)
-
-
-Questions on configuring ActiveMQ's JMS client or the Message Broker
-
-*   [How can I enable detailed logging](how-can-i-enable-detailed-logging)
-*   [How does XBean compare to Spring 2](how-does-xbean-compare-to-spring-2)
-*   [How do I configure 10s of 1000s of Queues in a single broker](how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker)
-*   [How do I configure ActiveMQ to hold 100s of millions of Queue Messages](how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages)
-*   [How do I configure ActiveMQ to use AIO server transport](how-do-i-configure-activemq-to-use-aio-server-transport)
-*   [How do I configure automatic reconnection](how-do-i-configure-automatic-reconnection)
-*   [How do I configure distributed queues or topics](how-do-i-configure-distributed-queues-or-topics)
-*   [How do I configure the queues I want](how-do-i-configure-the-queues-i-want)
-*   [How do I define a local address and local port for TCP or SSL](how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl)
-*   [How do I disable persistence](how-do-i-disable-persistence)
-*   [How do I run ActiveMQ under the Kaffe JVM](how-do-i-run-activemq-under-the-kaffe-jvm)
-*   [How to configure a new database](how-to-configure-a-new-database)
-*   [How to deploy activemq-ra-version.rar to weblogic](how-to-deploy-activemq-ra-versionrar-to-weblogic)
-*   [How to disable multicast discovery](how-to-disable-multicast-discovery)
-
diff --git a/src/contact.md b/src/contact.md
new file mode 100644
index 0000000..f1f61f0
--- /dev/null
+++ b/src/contact.md
@@ -0,0 +1,41 @@
+---
+layout: default_md
+title: Contact Us
+title-class: page-title-main
+type: main
+---
+Whether you have a simple question about configuration, a use-case you're confused about, a new feature you want to discuss, etc. the community is here to help.
+
+If you fairly certain you're hitting a bug [please report it](issues) via one of our issue trackers.
+
+#### Mailing Lists
+
+The *best* way to contact folks in the community is by using one of the mailing lists. We have two main mailing lists - the **users** list and the **dev** list. Choose the right list based on whether you're deploying or using ActiveMQ or you're a developer working directly on one of the ActiveMQ code-bases. You can interact with the list via web-based forum if that suits you better.
+
+To subscribe to or unsubscribe from a list simply:
+
+ 1. Send a blank email to the appropriate address (see below).
+ 1. The automated mailing list manager will send an reply (either a confirmation request or an error message, e.g. if you are not subscribed).
+ 1. Reply to the confirmation message.
+
+<a class="anchor" name="mailing"></a>
+
+|List|Subscribe|Unsubscribe|Archives|Forum|
+|---|---|---|---|---|
+|Users|[users-subscribe@activemq.apache.org](mailto:users-subscribe@activemq.apache.org)|[users-unsubscribe@activemq.apache.org](mailto:users-unsubscribe@activemq.apache.org)|[Apache](http://mail-archives.apache.org/mod_mbox/activemq-users/), [Markmail](http://activemq.markmail.org/search/list:org.apache.activemq.users)|[Nabble](http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html)|
+|Dev|[dev-subscribe@activemq.apache.org](mailto:dev-subscribe@activemq.apache.org)|[dev-unsubscribe@activemq.apache.org](mailto:dev-unsubscribe@activemq.apache.org)|[Apache](http://mail-archives.apache.org/mod_mbox/activemq-dev/), [Markmail](http://activemq.markmail.org/search/list:org.apache.activemq.dev)|[Nabble](http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html)|
+
+Mailing list participants are expected to abide by the well-established rules of "netiquette", as well as the ASF's published [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html).
+
+**Please read these [tips for email contributors](https://apache.org/dev/contrib-email-tips.html)**, especially if you're not getting the support you expect. 
+
+If you're curious you can [read more](https://apache.org/foundation/mailinglists.html) about how these lists work at Apache.
+
+
+#### Chat
+
+If for some reason a mailing list doesn't work for you then you can potentially chat with other community members in real-time using **[IRC](https://en.wikipedia.org/wiki/Internet_Relay_Chat)** or **[Slack](https://slack.com/)**. 
+
+The IRC channel is not very active these days, but you may still have luck. Point your IRC client to `irc.freenode.net` or use [https://webchat.freenode.net/](https://webchat.freenode.net/) and join the `#apache-activemq` channel. Due to some spam issues we've experienced in the past you'll need to register your nickname before entering the channel. You can find more details about that on [Freenode's website](https://freenode.net/kb/answer/registration). Chat [logs](http://javabot.evanch [...]
+
+Slack is a relatively new and productive collaboration platform. Access to the [ASF Slack](https://the-asf.slack.com) requires an invitation. If you want an invitation to the ActiveMQ Slack channel simply send a request to the [users mailing list](#mailing).
diff --git a/src/contact/index.md b/src/contact/index.md
deleted file mode 100644
index 7467c05..0000000
--- a/src/contact/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-layout: default_md
-title: Contact Us
-title-class: page-title-main
-type: main
----
-
-#### Contributing <a class="anchor" name="contributing"></a>
-
-|ActiveMQ Artemis GitHub Page|[https://github.com/apache/activemq-artemis](https://github.com/apache/activemq-artemis)|
-|ActiveMQ 5 GitHub Page|[https://github.com/apache/activemq](https://github.com/apache/activemq)|
-
-<br/>
-
-#### Chat <a class="anchor" name="chat"></a>
-
-You can find many ActiveMQ developers and users in IRC and/or Slack:
-
-IRC|irc.freenode.net|#apache-activemq|[logs](http://javabot.evanchooly.com/logs/%23apache-activemq/today)
-Slack|https://the-asf.slack.com|activemq|
-
-<br/>
-
-#### Report Issues <a class="anchor" name="issues"></a>
-
-ActiveMQ Artemis JIRA|[https://issues.apache.org/jira/browse/ARTEMIS](https://issues.apache.org/jira/browse/ARTEMIS)
-ActiveMQ 5 JIRA|[https://issues.apache.org/jira/browse/AMQ](https://issues.apache.org/jira/browse/AMQ)
-ActiveMQ CMS JIRA|[https://issues.apache.org/jira/browse/AMQCPP](https://issues.apache.org/jira/browse/AMQCPP)
-ActiveMQ NMS JIRA|[https://issues.apache.org/jira/browse/AMQNET](https://issues.apache.org/jira/browse/AMQNET)
-
-<br/>
-
-#### ActiveMQ User Mailing List <a class="anchor" name="mailing"></a>
-
-This mailing list is for end users to ask general questions about ActiveMQ
-
-Subscribe|[users-subscribe@activemq.apache.org](mailto:users-subscribe@activemq.apache.org)
-Unsubscribe|[users-unsubscribe@activemq.apache.org](mailto:users-unsubscribe@activemq.apache.org)
-Apache Archive|[http://mail-archives.apache.org/mod_mbox/activemq-users/](http://mail-archives.apache.org/mod_mbox/activemq-users/)
-Mark Mail Archive|[http://activemq.markmail.org/search/list:org.apache.activemq.users](http://activemq.markmail.org/search/list:org.apache.activemq.users)
-Nabble Forum|[http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html](http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html)
-
-<br/> 
-
-#### ActiveMQ Developer Mailing List
-
-This mailing list is for developers to discuss issues related to the development of ActiveMQ itself.
-
-Subscribe|[dev-subscribe@activemq.apache.org](mailto:dev-subscribe@activemq.apache.org)
-Unsubscribe|[dev-unsubscribe@activemq.apache.org](mailto:dev-unsubscribe@activemq.apache.org)
-Apache Archive|[http://mail-archives.apache.org/mod_mbox/activemq-dev/](http://mail-archives.apache.org/mod_mbox/activemq-dev/)
-Mark Mail Archive|[http://activemq.markmail.org/search/list:org.apache.activemq.dev](http://activemq.markmail.org/search/list:org.apache.activemq.dev)
-Nabble Forum|[http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html](http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html)
-
-<br/>
-
-#### ActiveMQ Commits Mailing List
-
-This mailing list get automatically notified when the project source code gets updated.
-
-Subscribe|[commits-subscribe@activemq.apache.org](mailto:commits-subscribe@activemq.apache.org)
-Unsubscribe|[commits-unsubscribe@activemq.apache.org](mailto:commits-unsubscribe@activemq.apache.org)
-Apache Archive|[http://mail-archives.apache.org/mod_mbox/activemq-commits/](http://mail-archives.apache.org/mod_mbox/activemq-commits/)
-Mark Mail Archive|[http://activemq.markmail.org/search/list:org.apache.activemq.commits](http://activemq.markmail.org/search/list:org.apache.activemq.commits)
-
-<br/>
-
-#### ActiveMQ Issues Mailing List
-
-This mailing list get automatically notified when JIRA issues are created and updated.
-
-Subscribe|[issues-subscribe@activemq.apache.org](mailto:issues-subscribe@activemq.apache.org)
-Unsubscribe|[issues-unsubscribe@activemq.apache.org](mailto:issues-unsubscribe@activemq.apache.org)
-Apache Archive|[http://mail-archives.apache.org/mod_mbox/activemq-issues/](http://mail-archives.apache.org/mod_mbox/activemq-issues/)
-Mark Mail Archive|[http://activemq.markmail.org/search/list:org.apache.activemq.issues](http://activemq.markmail.org/search/list:org.apache.activemq.issues)
-
-<br/>
-
-#### ActiveMQ GitBox Mailing List
-
-This mailing list is for comments and other events for pull-requests on the ActiveMQ code-base.
-
-Subscribe|[gitbox-subscribe@activemq.apache.org](mailto:gitbox-subscribe@activemq.apache.org)
-Unsubscribe|[gitbox-unsubscribe@activemq.apache.org](mailto:gitbox-unsubscribe@activemq.apache.org)
-Apache Archive|[http://mail-archives.apache.org/mod_mbox/activemq-gitbox/](http://mail-archives.apache.org/mod_mbox/activemq-gitbox/)
-Mark Mail Archive|[http://activemq.markmail.org/search/list:org.apache.activemq.gitbox](http://activemq.markmail.org/search/list:org.apache.activemq.gitbox)
diff --git a/src/contributing.md b/src/contributing.md
index 9b69b18..fd6677c 100644
--- a/src/contributing.md
+++ b/src/contributing.md
@@ -1,97 +1,47 @@
 ---
 layout: default_md
 title: Contributing
-title-class: page-title-activemq5
-type: activemq5
+title-class: page-title-main
+type: main
 ---
-
-[Community](community) > [Contributing](contributing)
-
-
 There are many ways you can help make ActiveMQ a better piece of software - please dive in and help!
 
-Try surf the documentation - if somethings confusing or not clear, let us know. Download the code & try it out and see what you think. Browse the source code. Got an itch to scratch, want to tune some operation or add some feature?
-
-Want to do some hacking on ActiveMQ? Try surfing to our [issue tracker](http://issues.apache.org/jira/browse/AMQ) for open issues or features that need to be implemented, take ownership of an issue and try fix it.
-
-Getting in touch
-----------------
-
-There are various ways of communicating with the ActiveMQ community.
-
-*   join us on the [Discussion Forums](discussion-forums) or subscribe to the [Mailing Lists](mailing-lists) and take part in any conversations
-*   pop by on in [irc](irc) and say hi    
-*   add some comments to the [wiki](navigation)
-
-If you find a bug or problem
-----------------------------
-
-Please raise a new issue in our [issue tracker](https://issues.apache.org/jira/browse/AMQ)
-
-If you can create a JUnit test case then your issue is more likely to be resolved quicker.  
-e.g. take a look at some of the existing [unit tests cases](https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tree;f=activemq-unit-tests/src/test;h=185a655c5200ed30fd2964bc236c18c5bde534c4;hb=refs/heads/master)
-
-Then we can add your issue to the test suite and then we'll know when its really fixed and we can ensure that the problem **stays fixed** in future releases.
-
-If you want to help out with the documentation
-----------------------------------------------
-
-If you want to contribute to the ActiveMQ documentation you should first subscribe our [dev@](mailto:dev-subscribe@activemq.apache.org) where ActiveMQ developers interact with each other. If you want edit rights on the ActiveMQ site, create an account in the [ActiveMQ wiki](https://cwiki.apache.org/confluence/display/ACTIVEMQ) and fill in and submit an ICLA to the ASF (see the [Committer Guide](becoming-a-committer)). Then ask on the dev@ list to be granted edit rights and an admin will  [...]
-
-Working on the code
--------------------
-
-Grab the [Source](source) from git
-
-Build the project.
-```
-export MAVEN_OPTS="-Xmx512M -XX:MaxPermSize=128M"
-mvn -Dtest=false install
-```
-PS: You might need to build multiple times (if you get a build error) because sometimes maven fails to download all the files.
-
-Create a project in your IDE. e.g. if you are using Eclipse the following should do the trick.
-```
-mvn eclipse:eclipse
-```
-Then import the projects into your workspace.
-
-Creating patches
-----------------
-
-We gladly accept patches if you can find ways to improve, tune or fix ActiveMQ in some way.
-
-Most IDEs can create nice patches now very easily. e.g. in Eclipse just right click on a file/directory and select Team -> Create Patch. Then just save the patch as a file and then submit it. (You may have to click on Team -> Share... first to enable the Subversion options).
-
-If you're a command line person try the following to create the patch
-```
-diff -u Main.java.orig Main.java >> patchfile.txt
-```
-or
-```
-git diff Main.java >> patchfile.txt
-```
-
-Submitting patches
-------------------
+ - If you have a problem with the software or the documentation the first thing you might consider is [asking a question](contact#mailing). 
+ - If you think you've hit a bug or want to request a new feature feel free to open [an issue](issues) in one of our trackers.
+ - If you're already familiar with an ActiveMQ component then join a [mailing list](contact#mailing) and help answers questions from the community.
 
-The easiest way to submit a patch is to create a new JIRA issue, attach the patch and tick the ASF license grant check box, tick the Patch Attached button on the issue then fire off an email to the [Mailing Lists](mailing-lists) or [Discussion Forums](discussion-forums).
+#### Documentation
 
-Becoming a commmitter
----------------------
+If anything in any component's documentation is confusing or not clear please [let us know](contact).
 
-Once you've got involved as above, we may well invite you to be a committer. See [Becoming a committer](becoming-a-committer) for more details.
+#### Code
 
-Using the issue tracker
------------------------
+If you want to get your hands on the code here are the repos for all our components. It's typically best to use the GitHub mirror as that will allow you to easily send pull requests which can be reviewed by project committers and merged.
 
-Before you can raise an issue in the issue tracker you need to register with it. This is quick & painless.
+|Component|Apache Git Repository|GitHub Mirror|
+|---|---|
+|Classic|[activemq](https://git-wip-us.apache.org/repos/asf?p=activemq.git)|[activemq](https://github.com/apache/activemq)|
+|Artemis|[activemq-artemis](https://git-wip-us.apache.org/repos/asf?p=activemq-artemis.git)|[activemq-artemis](https://github.com/apache/activemq-artemis)|
+|Artemis Native|[activemq-artemis-native](https://git-wip-us.apache.org/repos/asf?p=activemq-artemis-native.git)|[activemq-artemis-native](https://github.com/apache/activemq-artemis-native)|
+|NMS API|[activemq-nms-api](https://git-wip-us.apache.org/repos/asf?p=activemq-nms-api.git)|[activemq-nms-api](https://github.com/apache/activemq-nms-api)|
+|NMS AMQP|[activemq-nms-amqp](https://git-wip-us.apache.org/repos/asf?p=activemq-nms-amqp.git)|[activemq-nms-amqp](https://github.com/apache/activemq-nms-amqp)|
+|NMS EMS|[activemq-nms-ems](https://git-wip-us.apache.org/repos/asf?p=activemq-nms-ems.git)|[activemq-nms-ems](https://github.com/apache/activemq-nms-ems)|
+|NMS OpenWire|[activemq-nms-openwire](https://git-wip-us.apache.org/repos/asf?p=activemq-nms-openwire.git)|[activemq-nms-openwire](https://github.com/apache/activemq-nms-openwire)|
+|NMS MSMQ|[activemq-nms-msmq](https://git-wip-us.apache.org/repos/asf?p=activemq-nms-msmq.git)|[activemq-nms-msmq](https://github.com/apache/activemq-nms-msmq)|
+|NMS STOMP|[activemq-nms-stomp](https://git-wip-us.apache.org/repos/asf?p=activemq-nms-stomp.git)|[activemq-nms-stomp](https://github.com/apache/activemq-nms-stomp)|
+|NMS XMS|[activemq-nms-xms](https://git-wip-us.apache.org/repos/asf?p=activemq-nms-xms.git)|[activemq-nms-xms](https://github.com/apache/activemq-nms-xms)|
+|NMS ZMQ|[activemq-nms-zmq](https://git-wip-us.apache.org/repos/asf?p=activemq-nms-zmq.git)|[activemq-nms-zmq](https://github.com/apache/activemq-nms-zmq)|
+|CLI Tools|[activemq-cli-tools](https://git-wip-us.apache.org/repos/asf?p=activemq-cli-tools.git)|[activemq-cli-tools](https://github.com/apache/activemq-cli-tools)|
+|CPP|[activemq-cpp](https://git-wip-us.apache.org/repos/asf?p=activemq-cpp.git)|[activemq-cpp](https://github.com/apache/activemq-cpp)|
+|Website|[activemq-website](https://git-wip-us.apache.org/repos/asf?p=activemq-website.git)|[activemq-website](https://github.com/apache/activemq-website)|
 
-If you want to have a go at fixing an issue you need to be in the list of activemq-developers on the issue tracker. To join the group, please mail the [dev@activemq.apache.org](mailto:dev@activemq.apache.org) mail list with the email address you used to register with the issue tracker and we'll add you to the group.
+#### Becoming a commmitter
 
-Why not dive in the [issue tracker](https://issues.apache.org/jira/browse/AMQ), and try tackle some of our outstanding issues?
+If you're interested in becoming a "committer" please check out this [this guide from Apache](https://infra.apache.org/new-committers-guide.html).
 
-Becoming a committer
---------------------
+#### Mailing Lists for Development Updates
 
-The first step is contributing to the project; if you want to take that a step forward and become a fellow committer on the project then see the [Committer Guide](becoming-a-committer)
+|List|Subscribe|Unsubscribe|Archives|Summary|
+|---|---|---|---|---|
+|Commits|[commits-subscribe@activemq.apache.org](mailto:commits-subscribe@activemq.apache.org)|[commits-unsubscribe@activemq.apache.org](mailto:commits-unsubscribe@activemq.apache.org)|[Apache](http://mail-archives.apache.org/mod_mbox/activemq-commits/), [Markmail](http://activemq.markmail.org/search/list:org.apache.activemq.commits)|notifications when the project source code gets updated|
+|Gitbox|[gitbox-subscribe@activemq.apache.org](mailto:gitbox-subscribe@activemq.apache.org)|[gitbox-unsubscribe@activemq.apache.org](mailto:gitbox-unsubscribe@activemq.apache.org)|[Apache](http://mail-archives.apache.org/mod_mbox/activemq-gitbox/), [Markmail](http://activemq.markmail.org/search/list:org.apache.activemq.gitbox)|comments and other events for pull-requests|
diff --git a/src/css/bootstrap/_code.scss b/src/css/bootstrap/_code.scss
index 9de20fa..450f291 100644
--- a/src/css/bootstrap/_code.scss
+++ b/src/css/bootstrap/_code.scss
@@ -10,7 +10,7 @@ samp {
 code {
   font-size: $code-font-size;
   color: $code-color;
-  word-break: break-word;
+  //word-break: break-word;
 
   // Streamline the style when inside anchors to avoid broken underline and more
   a > & {
diff --git a/src/css/main.scss b/src/css/main.scss
index 603c9d4..05b9042 100644
--- a/src/css/main.scss
+++ b/src/css/main.scss
@@ -381,7 +381,7 @@ h6 {
   background-color: $green !important;
   color: white;
   padding: 15px 0 15px 0;
-  margin-bottom: 20px;
+  //margin-bottom: 20px;
 }
 
 .page-title-main p {
@@ -389,7 +389,7 @@ h6 {
 }
 
 .page-title-main h1 {
-  font-size: 20px;
+  font-size: 30px;
   font-weight: bold;
 }
 
@@ -397,7 +397,7 @@ h6 {
   background-color: $purple !important;
   color: white;
   padding: 15px 0 15px 0;
-  margin-bottom: 20px;
+//  margin-bottom: 20px;
 }
 
 .page-title-artemis p {
@@ -405,7 +405,7 @@ h6 {
 }
 
 .page-title-artemis h1 {
-  font-size: 20px;
+  font-size: 30px;
   font-weight: bold;
 }
 
@@ -413,7 +413,7 @@ h6 {
   background-color: $pink !important;
   color: white;
   padding: 15px 0 15px 0;
-  margin-bottom: 20px;
+//  margin-bottom: 20px;
 }
 
 .page-title-activemq5 p {
@@ -425,7 +425,7 @@ h6 {
 }
 
 .page-title-activemq5 h1 {
-  font-size: 20px;
+  font-size: 30px;
   font-weight: bold;
 }
 
@@ -441,27 +441,15 @@ h6 {
   background-color: $orange !important;
 }
 
-.page-title-activemq5 {
-  background-color: $pink !important;
-  color: white;
-  padding: 15px 0 15px 0;
-  margin-bottom: 20px;
-}
-
-.page-title-activemq5 h1 {
-  font-size: 20px;
-  font-weight: bold;
-}
-
 .page-title-nms {
   background-color: $orange !important;
   color: white;
   padding: 15px 0 15px 0;
-  margin-bottom: 20px;
+//  margin-bottom: 20px;
 }
 
 .page-title-nms h1 {
-  font-size: 20px;
+  font-size: 30px;
   font-weight: bold;
 }
 
@@ -469,11 +457,11 @@ h6 {
   background-color: $blue !important;
   color: white;
   padding: 15px 0 15px 0;
-  margin-bottom: 20px;
+//  margin-bottom: 20px;
 }
 
 .page-title-cms h1 {
-  font-size: 20px;
+  font-size: 30px;
   font-weight: bold;
 }
 
@@ -614,6 +602,7 @@ table a {
 
 .main h4 {
   color: $green !important;
+  margin-top: 2rem;
 }
 
 .main blockquote {
@@ -640,6 +629,7 @@ table a {
 
 .artemis h4 {
   color: $purple !important;
+  margin-top: 2rem;
 }
 
 .artemis blockquote {
diff --git a/src/cvs.md b/src/cvs.md
deleted file mode 100644
index 7404836..0000000
--- a/src/cvs.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-layout: default_md
-title: CVS
-title-class: page-title-activemq5
-type: activemq5
---- 
-
-[Site](site.md) > [Old Links](old-links) > [CVS](cvs)
-
-Web Browsing of CVS
--------------------
-
-To browse CVS via the web use the FishEye interface
-
-[http://cvs.activemq.codehaus.org/](http://cvs.activemq.codehaus.org/)
-
-CVS Access behind a firewall
-----------------------------
-
-For those developers who are stuck behind a corporate firewall, you could try ask your firewall administrator nicely to open up CVS or SSH - or failing that [Fisheye](http://cvs.activemq.codehaus.org/) can support tarball downloads...
-
-Anonymous CVS access
---------------------
-
-This project's CVS repository can be checked out through anonymous (pserver) CVS with the following instruction set. When prompted for a password for anonymous, simply press the Enter key.
-
-```
-cvs -d :pserver:anonymous@cvs.activemq.codehaus.org:/home/projects/activemq/scm login cvs -z3 -d :pserver:anonymous@cvs.activemq.codehaus.org:/home/projects/activemq/scm co activemq
-```
-
-Updates from within the module's directory do not need the -d parameter.
-
-Developer CVS Access via SSH
-----------------------------
-
-Only project developers can access the CVS tree via this method. SSH1 must be installed on your client machine. Substitute username with the proper value. Enter your site password when prompted.
-
-```
-export CVS_RSH=ssh cvs -z3 -d :ext:username@cvs.activemq.codehaus.org:/home/projects/activemq/scm co activemq
-```
-
-Remember to replace 'username' with your actual username on cvs.activemq.codehaus.org.
diff --git a/src/developer-forum.md b/src/developer-forum.md
deleted file mode 100644
index 1e32803..0000000
--- a/src/developer-forum.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: default_md
-title: Developer Forum 
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Community](community) > [Mailing Lists](mailing-lists) > [Developer Forum](developer-forum)
-
-
-[ActiveMQ - Dev](http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html)
-
diff --git a/src/developers.md b/src/developers.md
index d2d84a5..c1e7969 100644
--- a/src/developers.md
+++ b/src/developers.md
@@ -8,7 +8,7 @@ type: activemq5
 [Developers](developers)
 
 
-*   [Becoming a committer](becoming-a-committer)
+*   [Becoming a committer](https://infra.apache.org/new-committers-guide.html)
 *   [Benchmark Tests](benchmark-tests)
 *   [Building](building)
 *   [Code Overview](code-overview)
diff --git a/src/developing-activemq.md b/src/developing-activemq.md
deleted file mode 100644
index 2375c7c..0000000
--- a/src/developing-activemq.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: default_md
-title: Developing ActiveMQ 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [Developing ActiveMQ](developing-activemq)
-
-
-Questions for developers wishing to extend or enhance Apache ActiveMQ
-
-*   [How can I add a new type of transport](how-can-i-add-a-new-type-of-transport)
-*   [How can I contribute](how-can-i-contribute)
-*   [How do I add my own plugins](how-do-i-add-my-own-plugins)
-*   [How do I debug ActiveMQ from my IDE](how-do-i-debug-activemq-from-my-ide)
-
diff --git a/src/discussion-forums.md b/src/discussion-forums.md
deleted file mode 100644
index 0822fa0..0000000
--- a/src/discussion-forums.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-layout: default_md
-title: Discussion Forums 
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Community](community) > [Discussion Forums](discussion-forums)
-
-
-Before posting you might want to read the [Tips for getting help](tips-for-getting-help).
-
-Many users prefer to use online forums rather than joining a mail list which can lead to lots more email traffic so we use the online forums at [Nabble forums](http://activemq.2283324.n4.nabble.com/) which also work with our [Mailing Lists](mailing-lists) so that both stay completely in sync. Use either the mailing lists or online forums, its completely up to you.
-
-### [ActiveMQ Forums](http://activemq.2283324.n4.nabble.com/)
-
-*   [ActiveMQ User Forum](http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html)
-*   [ActiveMQ Developer Forum](http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html)
-
-### Mailing Lists
-
-If you prefer to use a mailing list instead then check out our [Mailing Lists](mailing-lists). Note that the Forums and [Mailing Lists](mailing-lists) are kept in sync so its your choice which you use.
-
diff --git a/src/errors.md b/src/errors.md
deleted file mode 100644
index dc881d6..0000000
--- a/src/errors.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-layout: default_md
-title: Errors 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [Errors](errors)
-
-
-Questions on specific kinds of errors. If you have seen a specific exception then check the [Exceptions](exceptions)
-
-*   [Could not find PacketReader for packet type - UNKNOWN PACKET TYPE](could-not-find-packetreader-for-packet-type-unknown-packet-type)
-*   [Exceptions](exceptions)
-    *   [certificate_unknown](certificateunknown)
-    *   [IOException - could not find class for resource](ioexception-could-not-find-class-for-reDevelopers/source)
-    *   [java.io.InterruptedIOException](javaiointerruptedioexception)
-    *   [java.io.IOException Failed to create database 'derbydb', see the next exception for details](javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details)
-    *   [java.lang.NoSuchMethodError](javalangnosuchmethoderror)
-    *   [java.lang.NoSuchMethodException org.activemq.ra.ActiveMQResourceAdapter.setUseEmbeddedBroker](javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker)
-    *   [java.lang.OutOfMemory](javalangoutofmemory)
-    *   [javax.jms.JMSException - Wire format negociation timeout - peer did not send his wire format.](javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format)
-    *   [JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI () needs 2.1 API.](jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api)
-    *   [JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI (xxx) needs 2.1 API](jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api)
-    *   [Journal is already opened by this application](journal-is-already-opened-by-this-application)
-    *   [NoClassDefFoundError - org.springframework.core.io.Resource](noclassdeffounderror-orgspringframeworkcoreioresource)
-    *   [No suitable driver](no-suitable-driver)
-*   [I am having problems with the Spring JmsTemplate](i-am-having-problems-with-the-spring-jmstemplate)
-*   [I am not receiving any messages, what is wrong](i-am-not-receiving-any-messages-what-is-wrong)
-*   [I cannot connect to ActiveMQ from JConsole](i-cannot-connect-to-activemq-from-jconsole)
-*   [I do not receive messages in my second consumer](i-do-not-receive-messages-in-my-second-consumer)
-*   [I get errors building the code whats wrong](i-get-errors-building-the-code-whats-wrong)
-*   [log4j-WARN No appenders could be found for logger](log4j-warn-no-appenders-could-be-found-for-logger)
-*   [Multicast - Watch out for IPV6 vs IPV4 support on your operating system or distribution or network](multicast-watch-out-for-ipv6-vs-ipv4-support-on-your-operating-system-or-distribution-or-network)
-*   [My producer blocks](my-producer-blocks)
-*   [onMessage method of MessageListener is never called](onmessage-method-of-messagelistener-is-never-called)
-*   [Resource Adapter does not seem to pool connections](resource-adapter-does-not-seem-to-pool-connections)
-*   [Slow networks drop large messages](slow-networks-drop-large-messages)
-*   [The Broker will not start](the-broker-will-not-start)
-*   [The vm transport starts a broker before my configured broker starts](the-vm-transport-starts-a-broker-before-my-configured-broker-starts)
-*   [Why do I not get all of the messages I sent](why-do-i-not-get-all-of-the-messages-i-sent)
-*   [Why do I not receive messages on my durable topic subscription](why-do-i-not-receive-messages-on-my-durable-topic-subscription)
-*   [Why do KahaDB log files remain after cleanup](why-do-kahadb-log-files-remain-after-cleanup)
-
diff --git a/src/exceptions.md b/src/exceptions.md
deleted file mode 100644
index 3d5b1a2..0000000
--- a/src/exceptions.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: default_md
-title: Exceptions 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [Errors](errors) > [Exceptions](exceptions)
-
-
-Java Exceptions (when you get a nasty stack trace while working with ActiveMQ)
-
-*   [certificate_unknown](certificateunknown)
-*   [IOException - could not find class for resource](ioexception-could-not-find-class-for-reDevelopers/source)
-*   [java.io.InterruptedIOException](javaiointerruptedioexception)
-*   [java.io.IOException Failed to create database 'derbydb', see the next exception for details](javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details)
-*   [java.lang.NoSuchMethodError](javalangnosuchmethoderror)
-*   [java.lang.NoSuchMethodException org.activemq.ra.ActiveMQResourceAdapter.setUseEmbeddedBroker](javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker)
-*   [java.lang.OutOfMemory](javalangoutofmemory)
-*   [javax.jms.JMSException - Wire format negociation timeout - peer did not send his wire format.](javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format)
-*   [JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI () needs 2.1 API.](jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api)
-*   [JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI (xxx) needs 2.1 API](jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api)
-*   [Journal is already opened by this application](journal-is-already-opened-by-this-application)
-*   [NoClassDefFoundError - org.springframework.core.io.Resource](noclassdeffounderror-orgspringframeworkcoreioreDevelopers/source)
-*   [No suitable driver](no-suitable-driver)
-
diff --git a/src/faq.md b/src/faq.md
index fa5a171..bf5d2c6 100644
--- a/src/faq.md
+++ b/src/faq.md
@@ -5,16 +5,13 @@ title-class: page-title-activemq5
 type: activemq5
 ---
 
-Here are a list of commonly asked questions and answers. If you have any questions which are not on this list, please talk to us on the [forums](discussion-forums).
-
-We [welcome contributions](contributing) and this entire website is a [wiki that you can edit](how-does-the-website-work) so please join in and help us make the documentation better!
+Here are a list of commonly asked questions and answers. If you have any questions which are not on this list, please [contact us](contact).
 
 ### General
 
 General questions about ActiveMQ
 
-*   [Can I get commercial support](can-i-get-commercial-support)
-*   [How can I get help](how-can-i-get-help)
+*   [Can I get commercial support](issues#commercial-support)
 *   [How can I get the source code from subversion](how-can-i-get-the-source-code-from-subversion)
 *   [How does ActiveMQ compare to AMQP](how-does-activemq-compare-to-amqp)
 *   [How does ActiveMQ compare to Artemis](how-does-activemq-compare-to-artemis)
@@ -24,11 +21,9 @@ General questions about ActiveMQ
 *   [How does ActiveMQ compare to Mule](how-does-activemq-compare-to-mule)
 *   [How does ActiveMQ compare to Spread Toolkit](how-does-activemq-compare-to-spread-toolkit)
 *   [How does OpenWire compare to Stomp](how-does-openwire-compare-to-stomp)
-*   [How does the website work](how-does-the-website-work)
 *   [How do I avoid Maven downloading latest jars](how-do-i-avoid-maven-downloading-latest-jars)
 *   [How do I build but disable the unit tests](how-do-i-build-but-disable-the-unit-tests)
 *   [How do I compile from the source](how-do-i-compile-from-the-source)
-*   [How do I edit the website](how-do-i-edit-the-website)
 *   [How fast is ActiveMQ](how-fast-is-activemq)
 *   [Should I run ActiveMQ on Windows in a directory with spaces](should-i-run-activemq-on-windows-in-a-directory-with-spaces)
 *   [What is ActiveMQ](what-is-activemq)
@@ -164,7 +159,7 @@ Questions relating to long term persistence of messages.
 Questions on specific kinds of errors. If you have seen a specific exception then check the [Exceptions](exceptions)
 
 *   [Could not find PacketReader for packet type - UNKNOWN PACKET TYPE](could-not-find-packetreader-for-packet-type-unknown-packet-type)
-*   [Exceptions](exceptions)
+*   Exceptions
     *   [certificate_unknown](certificateunknown)
     *   [IOException - could not find class for resource](ioexception-could-not-find-class-for-reDevelopers/source)
     *   [java.io.InterruptedIOException](javaiointerruptedioexception)
@@ -200,7 +195,7 @@ Questions on specific kinds of errors. If you have seen a specific exception the
 Questions for developers wishing to extend or enhance Apache ActiveMQ
 
 *   [How can I add a new type of transport](how-can-i-add-a-new-type-of-transport)
-*   [How can I contribute](how-can-i-contribute)
+*   [How can I contribute](contributing)
 *   [How do I add my own plugins](how-do-i-add-my-own-plugins)
 *   [How do I debug ActiveMQ from my IDE](how-do-i-debug-activemq-from-my-ide)
 
diff --git a/src/general.md b/src/general.md
deleted file mode 100644
index d47bce5..0000000
--- a/src/general.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: default_md
-title: General 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [General](general)
-
-
-General questions about ActiveMQ
-
-*   [Can I get commercial support](can-i-get-commercial-Community/support)
-*   [How can I get help](how-can-i-get-help)
-*   [How can I get the source code from subversion](how-can-i-get-the-source-code-from-subversion)
-*   [How does ActiveMQ compare to AMQP](how-does-activemq-compare-to-Connectivity/Protocols/amqp)
-*   [How does ActiveMQ compare to Artemis](how-does-activemq-compare-to-artemis)
-*   [How does ActiveMQ compare to Fuse Message Broker](how-does-activemq-compare-to-fuse-message-broker)
-*   [How does ActiveMQ compare to JBossMQ](how-does-activemq-compare-to-jbossmq)
-*   [How does ActiveMQ compare to Mantaray](how-does-activemq-compare-to-mantaray)
-*   [How does ActiveMQ compare to Mule](how-does-activemq-compare-to-mule)
-*   [How does ActiveMQ compare to Spread Toolkit](how-does-activemq-compare-to-spread-toolkit)
-*   [How does OpenWire compare to Stomp](how-does-openwire-compare-to-stomp)
-*   [How does the website work](how-does-the-website-work)
-*   [How do I avoid Maven downloading latest jars](how-do-i-avoid-maven-downloading-latest-jars)
-*   [How do I build but disable the unit tests](how-do-i-build-but-disable-the-unit-tests)
-*   [How do I compile from the source](how-do-i-compile-from-the-source)
-*   [How do I edit the website](how-do-i-edit-the-website)
-*   [How fast is ActiveMQ](how-fast-is-activemq)
-*   [Should I run ActiveMQ on Windows in a directory with spaces](should-i-run-activemq-on-windows-in-a-directory-with-spaces)
-*   [What is ActiveMQ](what-is-activemq)
-*   [What is the license](what-is-the-license)
-*   [What jars do I need](what-jars-do-i-need)
-*   [What open source integration solution works best with ActiveMQ](what-open-source-integration-solution-works-best-with-activemq)
-*   [What platforms does ActiveMQ support](what-platforms-does-activemq-support)
-*   [What version should I use](what-version-should-i-use)
-
diff --git a/src/getting-started-3x.md b/src/getting-started-3x.md
index b159aa6..1174469 100644
--- a/src/getting-started-3x.md
+++ b/src/getting-started-3x.md
@@ -5,8 +5,6 @@ title-class: page-title-activemq5
 type: activemq5
 ---
 
-[Site](site) > [Old Links](old-links) > [Previous Versions](previous-versions) > [Getting Started 3.x](getting-started-3x)
-
 Introduction
 ------------
 
@@ -297,4 +295,4 @@ After the installation, ActiveMQ is running with a basic configuration. For deta
 Additional Resources
 --------------------
 
-If you are new to using ActiveMQ, running the [Examples](examples) is a good next step to learn more about ActiveMQ.
\ No newline at end of file
+If you are new to using ActiveMQ, running the [Examples](examples) is a good next step to learn more about ActiveMQ.
diff --git a/src/getting-started.md b/src/getting-started.md
index 94a2023..979801d 100644
--- a/src/getting-started.md
+++ b/src/getting-started.md
@@ -345,7 +345,7 @@ Also see [Configuring Transports](configuring-transports) to see how you can con
 
 See the [Initial Configuration](configuration) for details of which jars you need to add to your classpath to start using ActiveMQ in your Java code
 
-If you want to use JNDI to connect to your JMS provider then please view the [JNDI Support](support). If you are a Spring user you should read about [Spring Support](support)
+If you want to use JNDI to connect to your JMS provider then please view the [JNDI Support](jndi-support). If you are a Spring user you should read about [Spring Support](spring-support)
 
 After the installation, ActiveMQ is running with a basic configuration. For details on configuring options, please see refer to the [Configuration](configuration) section.
 
@@ -354,5 +354,5 @@ Additional Resources
 
 If you are new to using ActiveMQ, running the [Web Samples](web-samples) or the [Examples](examples) is a good next step to learn more about ActiveMQ.
 
-The Commercial Providers listed on the [Support](support) page may also have additional documentation, examples, tutorials, etc... that can help you get started.
+The commercial providers listed on the [issues](issues) page may also have additional documentation, examples, tutorials, etc... that can help you get started.
 
diff --git a/src/gettingstarted3x.md b/src/gettingstarted3x.md
deleted file mode 100644
index 0a94d5f..0000000
--- a/src/gettingstarted3x.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: default_md
-title: Getting+Started+3.x 
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Using ActiveMQ](using-activemq) > [Getting Started](getting-started) > [Getting+Started+3.x](gettingstarted3x)
-
-testing
diff --git a/src/how-can-i-contribute.md b/src/how-can-i-contribute.md
deleted file mode 100644
index 7951102..0000000
--- a/src/how-can-i-contribute.md
+++ /dev/null
@@ -1,101 +0,0 @@
----
-layout: default_md
-title: How can I contribute 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [Developing ActiveMQ](developing-activemq) > [How can I contribute](how-can-i-contribute)
-
-
-How can I contribute to Apache ActiveMQ?
-----------------------------------------
-
-There are many ways you can help make ActiveMQ a better piece of software - please dive in and help!
-
-Try surf the documentation - if somethings confusing or not clear, let us know. Download the code & try it out and see what you think. Browse the source code. Got an itch to scratch, want to tune some operation or add some feature?
-
-Want to do some hacking on ActiveMQ? Try surfing to our [issue tracker](http://issues.apache.org/jira/browse/AMQ) for open issues or features that need to be implemented, take ownership of an issue and try fix it.
-
-Getting in touch
-----------------
-
-There are various ways of communicating with the ActiveMQ community.
-
-*   join us on the [Discussion Forums](discussion-forums) or subscribe to the [Mailing Lists](mailing-lists) and take part in any conversations
-*   pop by on in [irc](Navigation/irc) and say hi
-    
-*   add some comments to the [wiki](navigation)
-
-If you find a bug or problem
-----------------------------
-
-Please raise a new issue in our [issue tracker](https://issues.apache.org/jira/browse/AMQ)
-
-If you can create a JUnit test case then your issue is more likely to be resolved quicker.  
-e.g. take a look at some of the existing [unit tests cases](https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tree;f=activemq-unit-tests/src/test;h=185a655c5200ed30fd2964bc236c18c5bde534c4;hb=refs/heads/master)
-
-Then we can add your issue to the test suite and then we'll know when its really fixed and we can ensure that the problem **stays fixed** in future releases.
-
-If you want to help out with the documentation
-----------------------------------------------
-
-If you want to contribute to the ActiveMQ documentation you should first subscribe our [dev@](mailto:dev-subscribe@activemq.apache.org) where ActiveMQ developers interact with each other. If you want edit rights on the ActiveMQ site, create an account in the [ActiveMQ wiki](https://cwiki.apache.org/confluence/display/ACTIVEMQ) and fill in and submit an ICLA to the ASF (see the [Committer Guide](becoming-a-committer)). Then ask on the dev@ list to be granted edit rights and an admin will  [...]
-
-Working on the code
--------------------
-
-Grab the [Source](source) from git
-
-Build the project.
-
-export MAVEN_OPTS="-Xmx512M -XX:MaxPermSize=128M"
-mvn -Dtest=false install
-
-PS: You might need to build multiple times (if you get a build error) because sometimes maven fails to download all the files.
-
-Create a project in your IDE. e.g. if you are using Eclipse the following should do the trick.
-
-mvn eclipse:eclipse
-
-Then import the projects into your workspace.
-
-Creating patches
-----------------
-
-We gladly accept patches if you can find ways to improve, tune or fix ActiveMQ in some way.
-
-Most IDEs can create nice patches now very easily. e.g. in Eclipse just right click on a file/directory and select Team -> Create Patch. Then just save the patch as a file and then submit it. (You may have to click on Team -> Share... first to enable the Subversion options).
-
-If you're a command line person try the following to create the patch
-
-diff -u Main.java.orig Main.java >> patchfile.txt
-
-or
-
-git diff Main.java >> patchfile.txt
-
-Submitting patches
-------------------
-
-The easiest way to submit a patch is to create a new JIRA issue, attach the patch and tick the ASF license grant check box, tick the Patch Attached button on the issue then fire off an email to the [Mailing Lists](mailing-lists) or [Discussion Forums](discussion-forums).
-
-Becoming a commmitter
----------------------
-
-Once you've got involved as above, we may well invite you to be a committer. See [Becoming a committer](becoming-a-committer) for more details.
-
-Using the issue tracker
------------------------
-
-Before you can raise an issue in the issue tracker you need to register with it. This is quick & painless.
-
-If you want to have a go at fixing an issue you need to be in the list of activemq-developers on the issue tracker. To join the group, please mail the [dev@activemq.apache.org](mailto:dev@activemq.apache.org) mail list with the email address you used to register with the issue tracker and we'll add you to the group.
-
-Why not dive in the [issue tracker](https://issues.apache.org/jira/browse/AMQ), and try tackle some of our outstanding issues?
-
-Becoming a committer
---------------------
-
-The first step is contributing to the project; if you want to take that a step forward and become a fellow committer on the project then see the [Committer Guide](becoming-a-committer)
-
diff --git a/src/how-can-i-get-help.md b/src/how-can-i-get-help.md
deleted file mode 100644
index 8a15d6a..0000000
--- a/src/how-can-i-get-help.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-layout: default_md
-title: How can I get help 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [General](general) > [How can I get help](how-can-i-get-help)
-
-
-Getting Help
-------------
-
-If you are experiencing problems using ActiveMQ then please report your problem to our [Issue Tracker](http://issues.apache.org/activemq/browse/AMQ). You may also find it useful to discuss your issues with the community on the [Discussion Forums](discussion-forums) or join one of our [Mailing Lists](mailing-lists).
-
-*   [Issue Tracker](https://issues.apache.org/jira/browse/AMQ)
-*   [Discussion Forums](discussion-forums)
-*   [Mailing Lists](mailing-lists)
-*   [FAQ](faq)
-
-### How to get help
-
-Before you report a problem you might want to read the [FAQ](faq).  
-Whenever you are reporting a problem please be sure to include as much information as possible; the more we know the more chance of a quicker resolution.
-
-*   Which [version](http://activemq.apache.orgOverviewOverview/Overview/download) of ActiveMQ
-*   What platform of Java (e.g., Java SE 6 with JRE/[JDK](#) 1.6.0 or J2SE 5 with JRE/[JDK](#) 1.5.0)
-*   Any particular application/web server or container being used - if so what version?
-*   Stack traces generally really help! If in doubt include the whole thing; often exceptions get wrapped in other exceptions and the exception right near the bottom explains the actual error, not the first few lines at the top. It's very easy for us to skim-read past unnecessary parts of a stack trace.
-*   Log output (e.g., `data/activemq.log`) can be useful too; sometimes [enabling DEBUG logging](how-do-i-change-the-logging) can help
-*   Your code & configuration files are often useful
-
-### How to get help faster
-
-We can help you much quicker if you try the following
-
-*   Provide us with a JUnit test case that demonstrates your issue. e.g. if you think you've found a bug, can you create a test case to demonstrate the bug?
-*   [Submit a patch](contributing) fixing the bug! (We also buy you beer when we meet you if you submit bug fixes ![(smile)](https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/smile.png) )
-*   For memory leaks or performance related issues, if you can run a profiler on your test case and attach the output as a file (or zipped file if it's huge) to the JIRA we can normally fix things much faster. e.g. you could run [jmap](http://java.sun.com/j2se/1.5.0/docs/tooldocs/share/jmap.html)/[jhat](http://java.sun.com/javase/6/docs/technotes/tools/share/jhat.html), JProfiler or YourKit on your code and send us the output. To find memory leaks it's quicker to resolve if you can tell  [...]
-
-Commercial Support
-------------------
-
-This is an open source project, so the amount of time we have available to help resolve your issue is often limited as all help is provided on a volunteer basis. If you want to get priority help, need to get up to speed quickly, require some training or mentoring, or need full 24 x 7 production support you should contact a commercial company specializing in ActiveMQ support such as...
-
-*   [apifocal](https://apifocal.com) is a Professional Services company. Headquartered near Washington, DC, USA, APIfocal provides consulting and training for leveraging the Apache Integration stack and commercial ESBs at large scale, adding automation and devops capabilities.
-*   [Media Driver](http://mediadriver.com) provides consulting services and management tools for Apache ActiveMQ and the Apache Integration stack for both the commercial and public sector.  We bring a full suite of project delivery services including business and technical analysis, proof of concepts, architectural guidance, best practice integration, and project management.  Media Driver offers training classes for developers and administrators, as well as middleware management software.
-*   [Rogue Wave / OpenLogic](http://www.openlogic.com/) has a dedicated team of OSS experts offering round-the-clock Production Support with competitive SLAs for troubleshooting ActiveMQ issues and outages. Rogue Wave offers a comprehensive week-long instructor-led training program for developers and admins. Rogue Wave OpenLogic also provides Architecture and Design Consulting, and a Developer Support contract to assist in the development of messaging applications.
-*   [Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/amq/) offers JBoss A-MQ, a supported distribution of Apache ActiveMQ, that include Enterprise Developer and Production Support, and offer training and consultancy for enterprise deployments.
-*   [Savoir Technologies, Inc](http://www.savoirtech.com) provides enterprise consulting, training and support for ActiveMQ and a host of other Apache service containers. Savoir can provide best practice mentoring for developing with ActiveMQ, as well as architectural/design reviews, troubleshooting and SOA infrastructure implementations. Savoir's staff includes some of the contributors of ActiveMQ who are on the ground consulting and are familiar with real world implementations and issues.
-*   [Total Transaction Management (TTM)](http://www.ttmsolutions.com/) provides ActiveMQ consulting and support, as well as security and [monitoring](http://www.ttmsolutions.com/Transactional_Software_Solutions/Active_Monitor_AMon.php/) add-on products and [reference guide](http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php) for ActiveMQ.
-*   [Tomitribe](http://tomitribe.com) are experts in Tomcat and ActiveMQ integration, champions of Open Source and Java EE.  Tomitribe offers consulting, training and support for TomEE, Tomcat, ActiveMQ, CXF and more.
-*   [TytoEASE](http://www.tytoease.com/activemq) offers support, consulting and training on enterprise ready open source projects including ActiveMQ.   Support offerings are at three levels with guaranteed SLA's. The company's consulting work is short term to help troubleshoot, fine-tune, do architectural reviews or help with initial design.  TytoEASE's focus is on the Enterprise with how customers integrate open source with their current technologies.
-
diff --git a/src/how-do-i-edit-the-website.md b/src/how-do-i-edit-the-website.md
deleted file mode 100644
index de9ebc7..0000000
--- a/src/how-do-i-edit-the-website.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: default_md
-title: How do I edit the website 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [General](general) > [How do I edit the website](how-do-i-edit-the-website)
-
-Contributing to the site
-------------------------
-
-The repository for the Apache ActiveMQ website is hosted at [https://github.com/apache/activemq-website](https://github.com/apache/activemq-website). See the [README](https://github.com/apache/activemq-website/blob/master/README.md) for contribution instructions.
\ No newline at end of file
diff --git a/src/how-does-activemq-compare-to-jbossmq.md b/src/how-does-activemq-compare-to-jbossmq.md
index f0d6ebb..d469aa4 100644
--- a/src/how-does-activemq-compare-to-jbossmq.md
+++ b/src/how-does-activemq-compare-to-jbossmq.md
@@ -26,7 +26,7 @@ Performance guides
 
 If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of [Performance](performance) or try using out the [ActiveMQ Performance Module Users Manual](activemq-performance-module-users-manual)
 
-The Commercial Providers on the [Support](support) page may also be able to help diagnose performance issues, suggest changes, etc...
+The commercial providers on the [issues](issues#commercial-support) page may also be able to help diagnose performance issues, suggest changes, etc...
 
 More on JBoss Integration
 -------------------------
diff --git a/src/how-does-activemq-compare-to-spread-toolkit.md b/src/how-does-activemq-compare-to-spread-toolkit.md
index ae5a395..62bddee 100644
--- a/src/how-does-activemq-compare-to-spread-toolkit.md
+++ b/src/how-does-activemq-compare-to-spread-toolkit.md
@@ -17,5 +17,5 @@ Performance guides
 
 If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of [Performance](performance) or try using out the [ActiveMQ Performance Module Users Manual](activemq-performance-module-users-manual)
 
-The Commercial Providers on the [Support](support) page may also be able to help diagnose performance issues, suggest changes, etc...
+The commercial providers on the [issues](issues#commercial-support) page may also be able to help diagnose performance issues, suggest changes, etc...
 
diff --git a/src/how-does-the-website-work.md b/src/how-does-the-website-work.md
deleted file mode 100644
index 9fbb48b..0000000
--- a/src/how-does-the-website-work.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-layout: default_md
-title: How does the website work 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [General](general) > [How does the website work](how-does-the-website-work)
-
-Apache ActiveMQ Website
-=======================
-
-The repository for the Apache ActiveMQ website is hosted at [https://github.com/apache/activemq-website](https://github.com/apache/activemq-website).
-
-How it works
-------------
-The [master branch](https://github.com/apache/activemq-website/tree/master/) of the repo contains the source files that are used to generate the HTML that ultimately gets pushed to the site. When a commit is made to the branch, a Jekyll build is automatically performed in CI and the generated site output committed back to the `asf-site` branch within the `output` directory. The generated content on `asf-site` is then automatically published to the live web server at https://activemq.apac [...]
-
-See [How do I edit the website](how-do-i-edit-the-website) for more information.
\ No newline at end of file
diff --git a/src/how-fast-is-activemq.md b/src/how-fast-is-activemq.md
index 65b075e..3e87ca0 100644
--- a/src/how-fast-is-activemq.md
+++ b/src/how-fast-is-activemq.md
@@ -18,5 +18,5 @@ Performance guides
 
 If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of [Performance](performance) or try using out the [ActiveMQ Performance Module Users Manual](activemq-performance-module-users-manual)
 
-The Commercial Providers on the [Support](support) page may also be able to help diagnose performance issues, suggest changes, etc...
+The commercial providers on the [issues](issues#commercial-support) page may also be able to help diagnose performance issues, suggest changes, etc...
 
diff --git a/src/how-you-can-help-release.md b/src/how-you-can-help-release.md
index eb091f8..d2c3d8a 100644
--- a/src/how-you-can-help-release.md
+++ b/src/how-you-can-help-release.md
@@ -11,7 +11,7 @@ type: activemq5
 How to Help
 -----------
 
-Everyone in the ActiveMQ community can help with releases; users, developers, commmiters are all encouraged to test out a release and post any comments to the [activemq-dev@ mailing list](mailing-lists) or create a [JIRA](https://issues.apache.org/activemq/browse/AMQ) issue.
+Everyone in the ActiveMQ community can help with releases; users, developers, commmiters are all encouraged to test out a release and post any comments to the [activemq-dev@ mailing list](contact#mailing) or create an [issue](issues).
 
 ActiveMQ is available in both source and binary distributions. See [Getting Started](getting-started).
 
diff --git a/src/i-am-not-receiving-any-messages-what-is-wrong.md b/src/i-am-not-receiving-any-messages-what-is-wrong.md
index 030e07e..6e88d86 100644
--- a/src/i-am-not-receiving-any-messages-what-is-wrong.md
+++ b/src/i-am-not-receiving-any-messages-what-is-wrong.md
@@ -20,5 +20,5 @@ For more details see the discussion of the **warnAboutUnstartedConnectionTimeout
 
 ### If you are calling connection.start()
 
-Another common gotcha is [due to another consumer grabbing the messages](i-do-not-receive-messages-in-my-second-consumer). If its not that then please look at [JMX](jmx) or the [Web Console](web-console) to determine what consumers are available and their status. Then get some [Support](support) to help you resolve your issue.
+Another common gotcha is [due to another consumer grabbing the messages](i-do-not-receive-messages-in-my-second-consumer). If it's not that then please look at [JMX](jmx) or the [Web Console](web-console) to determine what consumers are available and their status. Then report an [issue](issues) to help you resolve your issue.
 
diff --git a/src/index.html b/src/index.html
index 1e236de..981ecbf 100644
--- a/src/index.html
+++ b/src/index.html
@@ -23,8 +23,8 @@ layout: default
       <div class="card">
         <div class="card-body narative">
           <span>
-            <p>Apache ActiveMQ&reg; is the most popular open source, multi-protocol, Java-based messaging server. It supports industry standard protocols so users get the benefits of client choices across a broad range of languages and platforms. Connectivity from C, C++, Python, .Net, and more is available. Integrate your multi-platform applications using the ubiquitous <strong>AMQP</strong> protocol. Exchange messages between your web applications using <strong>STOMP</strong> over webs [...]
-            <p>There are currently two "flavors" of ActiveMQ available - the "classic" 5.x broker and the "next generation" Artemis broker. Once Artemis reaches a sufficient level of feature parity with the 5.x code-base it will become ActiveMQ 6. Initial <a href="{{site.baseurl}}/components/artemis/migration">migration documentation</a> is available.</p>
+            <p>Apache ActiveMQ&reg; is the most popular open source, multi-protocol, Java-based messaging server. It supports industry standard protocols so users get the benefits of client choices across a broad range of languages and platforms. Connect from clients written in JavaScript, C, C++, Python, .Net, and more. Integrate your multi-platform applications using the ubiquitous <strong>AMQP</strong> protocol. Exchange messages between your web applications using <strong>STOMP</stro [...]
+            <p>There are currently two "flavors" of ActiveMQ available - the well-known "classic" broker and the "next generation" broker code-named <i>Artemis</i>. Once Artemis reaches a sufficient level of feature parity with the "Classic" code-base it will become the next major version of ActiveMQ. Initial <a href="{{site.baseurl}}/components/artemis/migration">migration documentation</a> is available as well as a development <a href="{{site.baseurl}}/activemq-artemis-roadmap">roadmap [...]
           </span>
         </div>
       </div>
@@ -35,7 +35,7 @@ layout: default
     <div class="col-lg-6 col-md-auto">
       <div class="card card-pink">
         <div class="card-body">
-          <h4 class="card-title text-pink">ActiveMQ 5 "Classic"</h4>
+          <h4 class="card-title text-pink">ActiveMQ "Classic"</h4>
           <p>Long established, endlessly pluggable architecture serving many generations of applications.</p>
           <ul>
             <li>JMS 1.1 with full client implementation including JNDI</li>
@@ -53,14 +53,14 @@ layout: default
       <div class="card card-purple">
         <div class="card-body">
           <h4 class="card-title text-purple">ActiveMQ Artemis</h4>
-          <p>High-performance, non-blocking architecture for the next generation of event-driven messaging applications.</p>
+          <p>High-performance, non-blocking architecture for the next generation of messaging applications.</p>
           <ul>
             <li>JMS 1.1 & 2.0 with full client implementation including JNDI</li>
             <li>High availability using shared storage or network replication</li>
             <li>Simple & powerful protocol agnostic addressing model</li>
             <li>Flexible clustering for distributing load</li>
             <li>Advanced journal implementations for low-latency persistence as well as JDBC</li>
-            <li>High feature parity with ActiveMQ 5 to ease migration</li>
+            <li>High feature parity with ActiveMQ "Classic" to ease migration</li>
           </ul>
           <a style="margin-top: 10px" href="{{site.baseurl}}/components/artemis" class="btn btn-warning">Find out more<i class="fa-info-circle fa btn-icon"></i></a>
           <a style="margin-top: 10px" href="{{site.baseurl}}/components/artemis/download" class="btn btn-warning">Download Latest<i class="fa-download fa btn-icon"></i></a>
@@ -79,7 +79,7 @@ layout: default
           <div class="card">
             <div class="card-body narative-alt">
               <div class="card-body narative-alt">
-                <span>Enjoy the benefits of open source by <a href="contact#contributing">contributing to the code-base</a>, asking a question on our <a href="contact#mailing">mailing list</a>, or <a href="contact#issues">reporting a bug or requesting a feature</a>. When you particpate, we all win. That's the power of community. That's the power of open source.</span>
+                <span>Enjoy the benefits of open source by <a href="contributing">contributing to a code-base</a>, asking a question one of our <a href="contact#mailing">mailing list</a>, or <a href="issues">reporting a bug or requesting a feature</a>. When you particpate, we all win. That's the power of community. That's the power of open source.</span>
               </div>
             </div>
           </div>
diff --git a/src/irc.md b/src/irc.md
deleted file mode 100644
index 731ad7f..0000000
--- a/src/irc.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-layout: default_md
-title: IRC
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Site](site) > [Navigation](navigation) > [IRC](irc)
-
-
-Committers and contributors can often be found hanging out in IRC. Below is the information about the channel that we use: 
-
-**Server:** irc.freenode.net
-
-**Channel:** #apache-activemq
-
-There are many [IRC clients](https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients) available out there depending on the operating system you are using. 
-
-Note the IRC channel on codehaus is deprecated as of April 2015; please refrain from using that room.  Likewise, be aware there is a channel named #activemq on the freenode server - please avoid it as well.
-
diff --git a/src/issues.md b/src/issues.md
new file mode 100644
index 0000000..3f7bbd8
--- /dev/null
+++ b/src/issues.md
@@ -0,0 +1,65 @@
+---
+layout: default_md
+title: Reporting Issues
+title-class: page-title-main
+type: main
+---
+If you find a bug please raise a new issue in the appropriate tracker. If you're not quite sure you're hitting a bug consider [contacting us](contact) to get some clarity.
+
+Whenever you are reporting a problem please be sure to include as much information as possible; the more we know the more chance of a quicker resolution. Here's a few items to consider:
+
+* Which version of the component are you using on which Java platform?
+* Any particular application/web server or container being used? If so what version?
+* Stack traces generally really help! If in doubt include the whole thing. Fften exceptions get wrapped in other exceptions and the exception right near the bottom explains the actual error, not the first few lines at the top. It's very easy for us to skim-read past unnecessary parts of a stack trace.
+* Log output can be useful too; sometimes enabling `DEBUG` logging can help.
+* Your code & configuration files are often useful.
+
+We can help you much quicker if you try the following:
+
+* Provide us with a JUnit test case that demonstrates your issue. For example, if you think you've found a bug can you create a test case to demonstrate the bug?
+* [Send a PR](contributing) to fix the bug!
+* For memory leaks or performance related issues, if you can run a profiler on your test case and attach the output as a file (or zipped file if it's huge) to the issue we can normally fix things much faster. e.g. you could run [jmap](https://docs.oracle.com/javase/7/docs/technotes/tools/share/jmap.html)/[jhat](https://docs.oracle.com/javase/7/docs/technotes/tools/share/jhat.html), JProfiler or YourKit on your code and send us the output. To find memory leaks it's quicker to resolve if y [...]
+
+|Component|Issue Tracker|
+|---|---|
+|Classic|[https://issues.apache.org/jira/projects/AMQ](https://issues.apache.org/jira/projects/AMQ)|
+|Artemis|[https://issues.apache.org/jira/projects/ARTEMIS](https://issues.apache.org/jira/projects/ARTEMIS)|
+|NMS|[https://issues.apache.org/jira/projects/AMQNET](https://issues.apache.org/jira/projects/AMQNET)|
+|CMS|[https://issues.apache.org/jira/projects/AMQCPP](https://issues.apache.org/jira/projects/AMQCPP)|
+
+#### Using the issue tracker
+
+Before you can raise an issue in the issue tracker you need to [create an account](https://issues.apache.org/jira/secure/Signup!default.jspa).
+
+If you want to be the "assignee" of an issue you need to be in the list of `activemq-developers` on the issue tracker. To join the group please mail the [dev mailing list](mailto:dev@activemq.apache.org) with the email address you used to register with the issue tracker and we'll add you to the group.
+
+#### Contributing Your Own Fixes
+
+Want to do some hacking on ActiveMQ? Try surfing to our issue trackers for open issues or features that need to be implemented. Take ownership of an issue and try fix it. See the article on [contributing](contributing) for more details on how to get the code.
+
+If you can create a JUnit test case then your issue is more likely to be resolved quicker. Then we can add your issue to the test suite and then we'll know when its really fixed and we can ensure that the problem **stays fixed** in future releases.
+
+#### ActiveMQ Issues Mailing List
+
+This mailing list is automatically notified when JIRA issues are created and updated.
+
+Subscribe|[issues-subscribe@activemq.apache.org](mailto:issues-subscribe@activemq.apache.org)
+Unsubscribe|[issues-unsubscribe@activemq.apache.org](mailto:issues-unsubscribe@activemq.apache.org)
+Apache Archive|[http://mail-archives.apache.org/mod_mbox/activemq-issues/](http://mail-archives.apache.org/mod_mbox/activemq-issues/)
+Mark Mail Archive|[http://activemq.markmail.org/search/list:org.apache.activemq.issues](http://activemq.markmail.org/search/list:org.apache.activemq.issues)
+
+#### Commercial Support <a class="anchor" name="commercial-support"></a>
+
+This is an open source project, so the amount of time we have available to help resolve your issue is often limited as all help is provided on a volunteer basis. If you want to get priority help, need to get up to speed quickly, require some training or mentoring, or need full 24 x 7 production support you should contact a commercial company specializing in ActiveMQ support such as...
+
+* [apifocal](https://apifocal.com) is a Professional Services company. Headquartered near Washington, DC, USA, APIfocal provides consulting and training for leveraging the Apache Integration stack and commercial ESBs at large scale, adding automation and devops capabilities.
+* [Amazon Web Services](https://aws.amazon.com/) provides [Amazon MQ](https://aws.amazon.com/amazon-mq/), a managed message broker service for Apache ActiveMQ "Classic" in the cloud. Amazon MQ manages the work involved in setting up an ActiveMQ message broker, from provisioning the infrastructure capacity you request–including server instances and storage–to installing the broker software itself. Once your broker is up and running, Amazon MQ automates common administrative tasks such as  [...]
+* [Media Driver](http://mediadriver.com) provides consulting services and management tools for Apache ActiveMQ and the Apache Integration stack for both the commercial and public sector.  We bring a full suite of project delivery services including business and technical analysis, proof of concepts, architectural guidance, best practice integration, and project management.  Media Driver offers training classes for developers and administrators, as well as middleware management software.
+* [HYTE](https://hyte.io/activemq-support/) Under the Apache License, HYTE offers HYTE MQ, an Open Source package of Apache ActiveMQ which provides enterprises a single distribution to support all DevOps pipelines and allows deployment in any environment: containers, cloud and on-premise. HYTE MQ is pre-configured with deployment and consulting best practices to ensure stability and ease of maintenance.  HYTE’s commercial offerings include: HYTE Console which provides a self-service, mul [...]
+* [OpenLogic](http://www.openlogic.com/) by Perforce has a team of ActiveMQ experts ready to help you, providing  24/7 support for troubleshooting issues and outages, consulting on architecture and design, instructor-led hands-on training. In addition to supporting many Apache packages OpenLogic’s enterprise architects have expertise in over 400 open source packages.
+* [Red Hat](https://www.redhat.com/en/technologies/jboss-middleware/amq) offers AMQ, a supported distribution of Apache ActiveMQ that includes enterprise developer and production support as well as training and consultancy for enterprise deployments.
+* [Savoir Technologies, Inc](http://www.savoirtech.com) provides enterprise consulting, training and support for ActiveMQ "Classic", ActiveMQ Artemis, and a host of other Apache service containers. Savoir can provide best practice mentoring for developing with ActiveMQ and ActiveMQ Artemis, as well as architectural/design reviews, troubleshooting and SOA infrastructure implementations. Savoir's staff includes some of the contributors of ActiveMQ and ActiveMQ Artemis who are on the ground [...]
+* [Total Transaction Management (TTM)](http://www.ttmsolutions.com/) provides ActiveMQ consulting and support, as well as security and [monitoring](http://www.ttmsolutions.com/Transactional_Software_Solutions/Active_Monitor_AMon.php/) add-on products and [reference guide](http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php) for ActiveMQ.
+* [Tomitribe](http://tomitribe.com) are experts in Tomcat and ActiveMQ integration, champions of Open Source and Java EE.  Tomitribe offers consulting, training and support for TomEE, Tomcat, ActiveMQ, CXF and more.
+* [TytoEASE](http://www.tytoease.com/activemq) offers support, consulting and training on enterprise ready open source projects including ActiveMQ.   Support offerings are at three levels with guaranteed SLA's. The company's consulting work is short term to help troubleshoot, fine-tune, do architectural reviews or help with initial design.  TytoEASE's focus is on the Enterprise with how customers integrate open source with their current technologies.
+* [Yupiik](https://www.yupiik.com) contributes and commits to the Apache ActiveMQ project. Provides consulting, training and support for Apache ActiveMQ and related projects like Apache Karaf, Apache Camel, Apache Kafka, Apache Unomi.
diff --git a/src/jdbc-support.md b/src/jdbc-support.md
index 2dc4267..67b6022 100644
--- a/src/jdbc-support.md
+++ b/src/jdbc-support.md
@@ -28,7 +28,7 @@ as well as a number of generic JDBC providers.
 
 We try to auto-detect from the JDBC driver which JDBCAdapter to use via these [config files](https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tree;f=activemq-jdbc-store/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc) and the return string from the JDBC driver.
 
-If you have a JDBC database which we don't support then please let us know what JDBC driver string you're getting and [drop us a note](discussion-forums) or raise an issue in our [support database](http://issues.apache.org/activemq/browse/AMQ) and we'll fix it pretty quickly.
+If you have a JDBC database which we don't support then please let us know what JDBC driver string you're getting and [drop us a note](contact) or raise an issue in our [support database](http://issues.apache.org/activemq/browse/AMQ) and we'll fix it pretty quickly.
 
 If your database is not in the above list it is normally a matter of tweaking the StatementProvider to ensure that the JDBCMessageStore uses the right flavour of SQL. So normally most databases support one of these providers...
 
diff --git a/src/jms.md b/src/jms.md
deleted file mode 100644
index 6d48e42..0000000
--- a/src/jms.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-layout: default_md
-title: JMS 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [JMS](jms)
-
-
-Questions on using the JMS API and [MOM](mom) in general
-
-*   [Can I modify messages on a queue](can-i-modify-messages-on-a-queue)
-*   [Can I send and receive messages concurrently on one JMS Connection](can-i-send-and-receive-messages-concurrently-on-one-jms-connection)
-*   [Can you browse a topic](can-you-browse-a-topic)
-*   [How do durable queues and topics work](how-do-durable-queues-and-topics-work)
-*   [How does a Queue compare to a Topic](how-does-a-queue-compare-to-a-topic)
-*   [How does ConnectionFactory relate to the Broker](how-does-connectionfactory-relate-to-the-broker)
-*   [How does JMS compare with email](how-does-jms-compare-with-email)
-*   [How do I consume a specific message](how-do-i-consume-a-specific-message)
-*   [How do I get started with JMS](how-do-i-get-started-with-jms)
-*   [How do I make messages durable](how-do-i-make-messages-durable)
-*   [How do I send messages to different Destinations from a single MessageProducer](how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer)
-*   [How do I use JMS efficiently](how-do-i-use-jms-efficiently)
-*   [How should I implement request response with JMS](how-should-i-implement-request-response-with-jms)
-*   [How To Unit Test JMS Code](how-to-unit-test-jms-code)
-*   [Multiple consumers on a queue](multiple-consumers-on-a-queue)
-*   [Should I use transactions](should-i-use-transactions)
-*   [Should I use XA](should-i-use-xa)
-*   [What are administered objects](what-are-administered-objects)
-
diff --git a/src/mailing-lists.md b/src/mailing-lists.md
deleted file mode 100644
index 12addd6..0000000
--- a/src/mailing-lists.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: default_md
-title: Mailing Lists
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Community](community) > [Mailing Lists](mailing-lists)
-
-[Mailing lists](contact)
\ No newline at end of file
diff --git a/src/navigation.md b/src/navigation.md
deleted file mode 100644
index dd31881..0000000
--- a/src/navigation.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: default_md
-title: Navigation
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Site](site) > [Navigation](navigation)
-
-
-
diff --git a/src/old-links.md b/src/old-links.md
deleted file mode 100644
index 075ae6c..0000000
--- a/src/old-links.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: default_md
-title: Old Links 
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Site](site) > [Old Links](old-links)
-
-Old Pages
----------
-
-This section of the wiki represents old links which typically redirect or include newer pages to preserve URLs.
-
-*   [activemq.dtd](activemqdtd)
-*   [ActiveSoap](activesoap)
-*   [ActiveSpace](activespace)
-*   [CVS](cvs)
-*   [New Features in 4.2](new-features-in-42)
-*   [Previous Versions](previous-versions)
-*   [STP](stp)
\ No newline at end of file
diff --git a/src/performance-report.md b/src/performance-report.md
index c9be81b..d652fa7 100644
--- a/src/performance-report.md
+++ b/src/performance-report.md
@@ -13,5 +13,5 @@ Performance guides
 
 If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of [Performance](performance) or try using out the [ActiveMQ Performance Module Users Manual](activemq-performance-module-users-manual)
 
-The Commercial Providers on the [Support](support) page may also be able to help diagnose performance issues, suggest changes, etc...
+The commercial providers on the [issues](issues#commercial-support) page may also be able to help diagnose performance issues, suggest changes, etc...
 
diff --git a/src/performance-tuning.md b/src/performance-tuning.md
index 4a02086..8cd02cf 100644
--- a/src/performance-tuning.md
+++ b/src/performance-tuning.md
@@ -55,5 +55,5 @@ Performance guides
 
 If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of [Performance](performance) or try using out the [ActiveMQ Performance Module Users Manual](activemq-performance-module-users-manual)
 
-The Commercial Providers on the [Support](support) page may also be able to help diagnose performance issues, suggest changes, etc...
+The commercial providers on the [issues](issues#commercial-support) page may also be able to help diagnose performance issues, suggest changes, etc...
 
diff --git a/src/performance.md b/src/performance.md
index 2f17750..da4644d 100644
--- a/src/performance.md
+++ b/src/performance.md
@@ -39,5 +39,5 @@ Performance guides
 
 If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of [Performance](performance) or try using out the [ActiveMQ Performance Module Users Manual](activemq-performance-module-users-manual)
 
-The Commercial Providers on the [Support](support) page may also be able to help diagnose performance issues, suggest changes, etc...
+The commercial providers on the [issues](issues#commercial-support) page may also be able to help diagnose performance issues, suggest changes, etc...
 
diff --git a/src/persistence-questions.md b/src/persistence-questions.md
deleted file mode 100644
index e4861af..0000000
--- a/src/persistence-questions.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: default_md
-title: Persistence Questions 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [Persistence Questions](persistence-questions)
-
-
-Questions relating to long term persistence of messages.
-
-*   [Are messages read directly from the journal](are-messages-read-directly-from-the-journal)
-*   [Does ActiveMQ support my SQL database](does-activemq-support-my-sql-database)
-*   [How does journaling work with multiple brokers](how-does-journaling-work-with-multiple-brokers)
-*   [How does the journal work](how-does-the-journal-work)
-*   [How do I back-up KahaDB](how-do-i-back-up-kahadb)
-*   [How do I change the message store directory for an embedded broker](how-do-i-change-the-message-store-directory-for-an-embedded-broker)
-*   [Is there a specified size of the journal](is-there-a-specified-size-of-the-journal)
-*   [What happens when the journal size is exceeded](what-happens-when-the-journal-size-is-exceeded)
-*   [What is the difference between persistent and non-persistent delivery](what-is-the-difference-between-persistent-and-non-persistent-delivery)
-
diff --git a/src/previous-versions.md b/src/previous-versions.md
index 048ccb6..9e2f2da 100644
--- a/src/previous-versions.md
+++ b/src/previous-versions.md
@@ -5,10 +5,8 @@ title-class: page-title-activemq5
 type: activemq5
 ---
 
-[Site](site) > [Old Links](old-links) > [Previous Versions](previous-versions)
-
-*   [ActiveMQ 3 Networks of Brokers](activemq-3-networks-of-brokers)
+*   [ActiveMQ 3 Networks of Brokers](networks-of-brokers)
 *   [ActiveMQ 3 Transport Configurations](activemq-3-transport-configurations)
 *   [Advisory Support in ActiveMQ 3](advisory-support-in-activemq-3)
 *   [Getting Started 3.x](getting-started-3x)
-*   [Running a 3.x Broker](running-a-3x-broker)
\ No newline at end of file
+*   [Running a 3.x Broker](running-a-3x-broker)
diff --git a/src/projects-using-activemq.md b/src/projects-using-activemq.md
index 5b411a0..523585a 100644
--- a/src/projects-using-activemq.md
+++ b/src/projects-using-activemq.md
@@ -1,27 +1,19 @@
 ---
 layout: default_md
-title: Projects Using ActiveMQ 
+title: Projects Using ActiveMQ "Classic"
 title-class: page-title-activemq5
 type: activemq5
 ---
 
 [Community](community) > [Projects Using ActiveMQ](projects-using-activemq)
 
-
-*   [Apache Camel](http://activemq.apache.org/camel/) is a POJO based routing and mediation framework
-*   [Apache CXF](http://incubator.apache.org/cxf/) is a JAX-WS client and web services framework
-*   [Apache Geronimo](http://geronimo.apache.org/) is the J2EE server project of the Apache Software Foundation.
-*   [Apache ServiceMix](http://incubator.apache.org/servicemix/) an open source Enterprise Service Bus (ESB) based around the Java Business Integration specification (JSR 208). ServiceMix consists of a JBI container and component suite, massive [connectivity](http://incubator.apache.org/servicemix/Components) with complete integration with Spring and Geronimo as well as supporting straight through, SEDA and clustered message flows, smart routing and transformations and orchestration via BPEL.
-*   [Apache Jetspeed](http://portals.apache.org/jetspeed-2/) is the Apache enterprise portal.
-*   [Apache Directory](http://directory.apache.org/) is the Apache LDAP and Directory services project.
-*   [Apache TomEE](http://openejb.apache.org) ActiveMQ is the default JMS provider.
-*   [Lingo](http://lingo.codehaus.org/) a remoting framework for [Spring](http://www.springframework.org/) which use JMS and ActiveMQ by default.
-*   [Eclipse](http://www.eclipse.org/) is integrating ActiveMQ into the real time editing features for team development
-*   [ActiveCluster](http://activecluster.codehaus.org/) is a clustering API with an implementation which uses JMS and ActiveMQ by default.
-*   [ActiveSOAP](http://activesoap.codehaus.org/) is a lightweight and fast SOAP stack with pluggable transports
-*   [OpenIM Java Jabber® Server](http://www.open-im.net/en/) is an open-source Java implementation (BSD License) of Jabber Instant Messager
-*   [Mule](http://mule.codehaus.org/) is an Enterprise Service Bus (ESB) messaging framework. It is a scalable, highly distributable object broker that can seamlessly handle interactions with services and applications using disparate transport and messaging technologies.
-*   [plan/b](http://planb.cloudnine.net.nz/) a distributed backup system
-*   [Hermes](http://www.hermesjms.com/) is a Swing application that allows you to interact with JMS providers. Hermes will work with any JMS enabled transport making it easy to browse or seach queues and topics, copy (via drag and drop) messages and delete them.
-*   [SpringSide](http://sourceforge.net/projects/springside/) Pragmatic Enterprise Application KickStart and Common Library Stack. Use Spring Framework as core,provided a enterprise application develop platform and demo the best practice in enterprise application.
+* [Apache Camel](https://camel.apache.org/) is a POJO based routing and mediation framework
+* [Apache CXF](https://cxf.apache.org/) is a JAX-WS client and web services framework
+* [Apache Geronimo](http://geronimo.apache.org/) is the Java EE server project of the Apache Software Foundation.
+* [Apache ServiceMix](https://servicemix.apache.org/) an open source Enterprise Service Bus (ESB) based around the Java Business Integration specification (JSR 208). ServiceMix consists of a JBI container and component suite, massive [connectivity](http://incubator.apache.org/servicemix/Components) with complete integration with Spring and Geronimo as well as supporting straight through, SEDA and clustered message flows, smart routing and transformations and orchestration via BPEL.
+* [Apache Jetspeed](http://portals.apache.org/jetspeed-2/) is the Apache enterprise portal.
+* [Apache TomEE](http://openejb.apache.org) ActiveMQ is the default JMS provider.
+* [Eclipse](http://www.eclipse.org/) is integrating ActiveMQ into the real time editing features for team development
+* [Mule](https://www.mulesoft.com/) is an Enterprise Service Bus (ESB) messaging framework. It is a scalable, highly distributable object broker that can seamlessly handle interactions with services and applications using disparate transport and messaging technologies.
+* [Hermes](https://sourceforge.net/projects/hermesjms/) is a Swing application that allows you to interact with JMS providers. Hermes will work with any JMS enabled transport making it easy to browse or seach queues and topics, copy (via drag and drop) messages and delete them.
 
diff --git a/src/running-a-3x-broker.md b/src/running-a-3x-broker.md
index 48ca20f..cb515d7 100644
--- a/src/running-a-3x-broker.md
+++ b/src/running-a-3x-broker.md
@@ -4,9 +4,6 @@ title: Running a 3.x Broker
 title-class: page-title-activemq5
 type: activemq5
 ---
-
-[Site](site) > [Old Links](old-links) > [Previous Versions](previous-versions) > [Running a 3.x Broker](running-a-3x-broker)
-
 The 3.x [binary distribution](download) of ActiveMQ comes with a script called 'activemq' which allows you to run a broker. Typing the following will run an ActiveMQ Broker using the out of the box configuration
 
 ```
@@ -82,4 +79,4 @@ Just change your connection URI in 3.x to
 
 ```
 reliable:tcp://host:port
-```
\ No newline at end of file
+```
diff --git a/src/security-advisories-apollo.md b/src/security-advisories-apollo.md
index d4c4adc..091b6e2 100644
--- a/src/security-advisories-apollo.md
+++ b/src/security-advisories-apollo.md
@@ -5,7 +5,7 @@ title-class: page-title-activemq5
 type: activemq5
 ---
 
-**NOTE: ActiveMQ Apollo is deprecated and no longer maintained. We strongly recommend you use [ActiveMQ 5.x](components/classic) or [ActiveMQ Artemis](components/artemis) instead.**
+**NOTE: ActiveMQ Apollo is deprecated and no longer maintained. We strongly recommend you use [ActiveMQ "Classic"](components/classic) or [ActiveMQ Artemis](components/artemis) instead.**
 
 Details of security problems fixed in released versions of Apache ActiveMQ Apollo are detailed below.
 
diff --git a/src/security-advisories.md b/src/security-advisories.md
index 5db526c..e73805c 100644
--- a/src/security-advisories.md
+++ b/src/security-advisories.md
@@ -4,31 +4,18 @@ title: Security Advisories
 title-class: page-title-main
 type: main
 ---
+Details of security problems fixed in released versions of individual Apache ActiveMQ components are detailed at:
 
-#### Prior updates
-
-Details of security problems fixed in released versions of individual Apache
-ActiveMQ components are detailed at:
-
-* [ActiveMQ 5](components/classic/security)
+* [ActiveMQ "Classic"](components/classic/security)
 * [ActiveMQ Artemis](components/artemis/security)
 * [ActiveMQ Apollo](security-advisories-apollo)
 
-
 #### Reporting new security problems with Apache ActiveMQ components
 
-We strongly encourage people to report security problems privately, using the
-security mailing list of the ASF Security Team, before disclosing them in a
-public forum.
+We strongly encourage people to report security problems privately, using the security mailing list of the ASF Security Team, before disclosing them in a public forum.
 
-Please see the [ASF Security Team](https://www.apache.org/security/) pages
-for contact information and further detail on the process.
+Please see the [ASF Security Team](https://www.apache.org/security/) pages for contact information and further detail on the process. 
 
-The ASF Security Team cannot accept regular bug reports or other queries,
-mail sent to tthem which does not relate to security problems in Apache
-software will be ignored.
+The ASF Security Team cannot accept regular bug reports or other queries, mail sent to tthem which does not relate to security problems in Apache software will be ignored.
 
-General questions such as those about using ActiveMQ components, or whether an
-exiting published vulnerability applies to your application, etc, should be
-addressed to our regular channels, e.g the users mailing list. Please see the
-[Contact page](contact) for details of how to subscribe.
+General questions such as those about using ActiveMQ components, or whether an exiting published vulnerability applies to your application, etc, should be addressed to our regular channels, e.g the users mailing list. Please see the [contact](contact) page for details of how to subscribe.
diff --git a/src/seda.md b/src/seda.md
index 6134e20..cddd06c 100644
--- a/src/seda.md
+++ b/src/seda.md
@@ -8,5 +8,5 @@ type: activemq5
  [FAQ](faq) > [Terminology](terminology) > [SEDA](seda)
 
 
-Staged Event Driven Architecture which is a design pattern for building high performance and scalable distributed systems. See [this paper](http://www.eecs.harvard.edu/~mdw/proj/seda/) for more details.
+[Staged Event Driven Architecture](https://en.wikipedia.org/wiki/Staged_event-driven_architecture) is a design pattern for building high performance and scalable distributed systems.
 
diff --git a/src/site.md b/src/site.md
deleted file mode 100644
index 98c4f68..0000000
--- a/src/site.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: default_md
-title: Site 
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Site](site)
-
-
-*   [Banner](banner)
-*   [Navigation](navigation)
-*   [QuickLinks](quicklinks)
-*   [SiteIndex](siteindex)
-*   [SiteMap](sitemap)
-
diff --git a/src/sitemap.md b/src/sitemap.md
index 43db582..cd6153f 100644
--- a/src/sitemap.md
+++ b/src/sitemap.md
@@ -66,7 +66,6 @@ Community
 *   [Articles](articles)
 *   [Books](books)
 *   [Contributing](contributing)
-*   [Discussion Forums](discussion-forums)
 *   [FAQ](faq)
     *   [Configuration](configuration)
         *   [How can I enable detailed logging](how-can-i-enable-detailed-logging)
@@ -85,7 +84,7 @@ Community
         *   [How to disable multicast discovery](how-to-disable-multicast-discovery)
     *   [Developing ActiveMQ](developing-activemq)
         *   [How can I add a new type of transport](how-can-i-add-a-new-type-of-transport)
-        *   [How can I contribute](how-can-i-contribute)
+        *   [How can I contribute](contributing)
         *   [How do I add my own plugins](how-do-i-add-my-own-plugins)
         *   [How do I debug ActiveMQ from my IDE](how-do-i-debug-activemq-from-my-ide)
     *   [Errors](errors)
@@ -121,8 +120,7 @@ Community
         *   [Why do I not receive messages on my durable topic subscription](why-do-i-not-receive-messages-on-my-durable-topic-subscription)
         *   [Why do KahaDB log files remain after cleanup](why-do-kahadb-log-files-remain-after-cleanup)
     *   [General](general)
-        *   [Can I get commercial support](can-i-get-commercial-support)
-        *   [How can I get help](how-can-i-get-help)
+        *   [Can I get commercial support](issues#commercial-support)
         *   [How can I get the source code from subversion](how-can-i-get-the-source-code-from-subversion)
         *   [How does ActiveMQ compare to AMQP](how-does-activemq-compare-to-amqp)
         *   [How does ActiveMQ compare to Artemis](how-does-activemq-compare-to-artemis)
@@ -132,11 +130,9 @@ Community
         *   [How does ActiveMQ compare to Mule](how-does-activemq-compare-to-mule)
         *   [How does ActiveMQ compare to Spread Toolkit](how-does-activemq-compare-to-spread-toolkit)
         *   [How does OpenWire compare to Stomp](how-does-openwire-compare-to-stomp)
-        *   [How does the website work](how-does-the-website-work)
         *   [How do I avoid Maven downloading latest jars](how-do-i-avoid-maven-downloading-latest-jars)
         *   [How do I build but disable the unit tests](how-do-i-build-but-disable-the-unit-tests)
         *   [How do I compile from the source](how-do-i-compile-from-the-source)
-        *   [How do I edit the website](how-do-i-edit-the-website)
         *   [How fast is ActiveMQ](how-fast-is-activemq)
         *   [Should I run ActiveMQ on Windows in a directory with spaces](should-i-run-activemq-on-windows-in-a-directory-with-spaces)
         *   [What is ActiveMQ](what-is-activemq)
@@ -243,18 +239,10 @@ Community
         *   [What is the difference between discovery, multicast and zeroconf](what-is-the-difference-between-discovery-multicast-and-zeroconf)
         *   [What is the Prefetch Limit For?](what-is-the-prefetch-limit-for)
         *   [While posting large binary file to activeMQ, is there a way to measure its progress](while-posting-large-binary-file-to-activemq-is-there-a-way-to-measure-its-progress)
-*   [Mailing Lists](mailing-lists)
-    *   [All Forums](all-forums)
-    *   [Developer Forum](developer-forum)
-    *   [User Forum](user-forum)
 *   [Privacy Policy](privacy-policy)
 *   [Projects Using ActiveMQ](projects-using-activemq)
 *   [Security Advisories](security-advisories)
-*   [Sponsorship](sponsorship)
-*   [Support](support)
-*   [Team](team)
-*   [Tips for getting help](tips-for-getting-help)
-*   [Users](users)
+*   [Support](issues)
 
 Overview
 --------
@@ -515,10 +503,8 @@ Tools
 Developers
 ----------
 
-*   [Becoming a committer](becoming-a-committer)
+*   [Becoming a committer](contributing)
 *   [Benchmark Tests](benchmark-tests)
-*   [Board Reports](board-reports)
-    *   [2007 April](Board Reports/2007-april)
 *   [Building](building)
 *   [Code Overview](code-overview)
 *   [Developer Guide](developer-guide)
@@ -552,13 +538,3 @@ Developers
 *   [Test Source XRef](test-source-xref)
 *   [Wire Protocol](wire-protocol)
 
-Site
-----
-
-*   [Banner](banner)
-*   [Navigation](navigation)
-    *   [IRC](Navigation/irc)
-*   [QuickLinks](quicklinks)
-*   [SiteIndex](Sitesiteindex)
-*   [SiteMap](Sitesitemap)
-
diff --git a/src/source.md b/src/source.md
index f43edda..e8c34f2 100644
--- a/src/source.md
+++ b/src/source.md
@@ -1,13 +1,9 @@
 ---
 layout: default_md
 title: Source 
-title-class: page-title-activemq5
-type: activemq5
+title-class: page-title-main
+type: main
 ---
-
-[Developers](developers) > [Source](source)
-
-
 ActiveMQ 5
 ==========
 
diff --git a/src/support.md b/src/support.md
deleted file mode 100644
index cf2ee31..0000000
--- a/src/support.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-layout: default_md
-title: Support
-title-class: page-title-activemq5
-type: activemq5
----
-
-[Community](community) > [Support](support)
-
-
-Getting Help
-------------
-
-If you are experiencing problems using ActiveMQ then please report your problem to our [Issue Tracker](http://issues.apache.org/activemq/browse/AMQ). You may also find it useful to discuss your issues with the community on the [Discussion Forums](discussion-forums) or join one of our [Mailing Lists](mailing-lists).
-
-*   [Issue Tracker](https://issues.apache.org/jira/browse/AMQ)
-*   [Discussion Forums](discussion-forums)
-*   [Mailing Lists](mailing-lists)
-*   [FAQ](faq)
-
-### How to get help
-
-Before you report a problem you might want to read the [FAQ](faq).  
-Whenever you are reporting a problem please be sure to include as much information as possible; the more we know the more chance of a quicker resolution.
-
-*   Which [version](http://activemq.apache.orgOverviewOverview/Overview/download) of ActiveMQ
-*   What platform of Java (e.g., Java SE 6 with JRE/[JDK](#) 1.6.0 or J2SE 5 with JRE/[JDK](#) 1.5.0)
-*   Any particular application/web server or container being used - if so what version?
-*   Stack traces generally really help! If in doubt include the whole thing; often exceptions get wrapped in other exceptions and the exception right near the bottom explains the actual error, not the first few lines at the top. It's very easy for us to skim-read past unnecessary parts of a stack trace.
-*   Log output (e.g., `data/activemq.log`) can be useful too; sometimes [enabling DEBUG logging](how-do-i-change-the-logging) can help
-*   Your code & configuration files are often useful
-
-### How to get help faster
-
-We can help you much quicker if you try the following
-
-*   Provide us with a JUnit test case that demonstrates your issue. e.g. if you think you've found a bug, can you create a test case to demonstrate the bug?
-*   [Submit a patch](contributing) fixing the bug! (We also buy you beer when we meet you if you submit bug fixes)
-*   For memory leaks or performance related issues, if you can run a profiler on your test case and attach the output as a file (or zipped file if it's huge) to the JIRA we can normally fix things much faster. e.g. you could run [jmap](http://java.sun.com/j2se/1.5.0/docs/tooldocs/share/jmap.html)/[jhat](http://java.sun.com/javase/6/docs/technotes/tools/share/jhat.html), JProfiler or YourKit on your code and send us the output. To find memory leaks it's quicker to resolve if you can tell  [...]
-
-Commercial Support
-------------------
-
-This is an open source project, so the amount of time we have available to help resolve your issue is often limited as all help is provided on a volunteer basis. If you want to get priority help, need to get up to speed quickly, require some training or mentoring, or need full 24 x 7 production support you should contact a commercial company specializing in ActiveMQ support such as...
-
-*   [apifocal](https://apifocal.com) is a Professional Services company. Headquartered near Washington, DC, USA, APIfocal provides consulting and training for leveraging the Apache Integration stack and commercial ESBs at large scale, adding automation and devops capabilities.
-*   [Amazon Web Services](https://aws.amazon.com/) provides [Amazon MQ](https://aws.amazon.com/amazon-mq/), a managed message broker service for Apache ActiveMQ in the cloud. Amazon MQ manages the work involved in setting up an ActiveMQ message broker, from provisioning the infrastructure capacity you request–including server instances and storage–to installing the broker software itself. Once your broker is up and running, Amazon MQ automates common administrative tasks such as patching [...]
-*   [Media Driver](http://mediadriver.com) provides consulting services and management tools for Apache ActiveMQ and the Apache Integration stack for both the commercial and public sector.  We bring a full suite of project delivery services including business and technical analysis, proof of concepts, architectural guidance, best practice integration, and project management.  Media Driver offers training classes for developers and administrators, as well as middleware management software.
-*   [HYTE](https://hyte.io/activemq-support/) Under the Apache License, HYTE offers HYTE MQ, an Open Source package of Apache ActiveMQ, which provides enterprises a single distribution to support all DevOps pipelines and allows deployment in any environment: containers, cloud and on-premise. HYTE MQ is pre-configured with deployment and consulting best practices to ensure stability and ease of maintenance.  HYTE’s commercial offerings include: HYTE Console which provides a self-service,  [...]
-*   [OpenLogic](http://www.openlogic.com/) by Perforce has a team of ActiveMQ experts ready to help you, providing  24/7 support for troubleshooting issues and outages, consulting on architecture and design, instructor-led hands-on training. In addition to supporting many Apache packages OpenLogic’s enterprise architects have expertise in over 400 open source packages.
-*   [Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/amq/) offers JBoss A-MQ, a supported distribution of Apache ActiveMQ, that include Enterprise Developer and Production Support, and offer training and consultancy for enterprise deployments.
-*   [Savoir Technologies, Inc](http://www.savoirtech.com) provides enterprise consulting, training and support for ActiveMQ, Apache ActiveMQ Artemis, and a host of other Apache service containers. Savoir can provide best practice mentoring for developing with ActiveMQ and ActiveMQ Artemis, as well as architectural/design reviews, troubleshooting and SOA infrastructure implementations. Savoir's staff includes some of the contributors of ActiveMQ and ActiveMQ Artemis who are on the ground  [...]
-*   [Total Transaction Management (TTM)](http://www.ttmsolutions.com/) provides ActiveMQ consulting and support, as well as security and [monitoring](http://www.ttmsolutions.com/Transactional_Software_Solutions/Active_Monitor_AMon.php/) add-on products and [reference guide](http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php) for ActiveMQ.
-*   [Tomitribe](http://tomitribe.com) are experts in Tomcat and ActiveMQ integration, champions of Open Source and Java EE.  Tomitribe offers consulting, training and support for TomEE, Tomcat, ActiveMQ, CXF and more.
-*   [TytoEASE](http://www.tytoease.com/activemq) offers support, consulting and training on enterprise ready open source projects including ActiveMQ.   Support offerings are at three levels with guaranteed SLA's. The company's consulting work is short term to help troubleshoot, fine-tune, do architectural reviews or help with initial design.  TytoEASE's focus is on the Enterprise with how customers integrate open source with their current technologies.
-*   [Yupiik](https://www.yupiik.com) contributes and commits to the Apache ActiveMQ project. Provides consulting, training and support for Apache ActiveMQ and related projects like Apache Karaf, Apache Camel, Apache Kafka, Apache Unomi.
diff --git a/src/team.md b/src/team.md
deleted file mode 100644
index 53d5400..0000000
--- a/src/team.md
+++ /dev/null
@@ -1,159 +0,0 @@
----
-layout: default_md
-title: Team
-title-class: page-title-activemq5
-type: activemq5
---- 
-
-[Community](community) > [Team](team)
-
-
-ActiveMQ Community
-==================
-
-This page lists who we are. By all means add yourself to the list - lets sort it in alphabetical order
-
-### Committers
-
-"A committer is a developer that was given write access to the code repository and has a signed Contributor License Agreement ([CLA](http://www.apache.org/licenses/icla.txt)) on file. They have an apache.org mail address. Not needing to depend on other people for the patches, they are actually making short-term decisions for the project. The PMC can (even tacitly) agree and approve it into permanency, or they can reject it. Remember that the PMC makes the decisions, not the individual pe [...]
-
-Name|ID|Organisation
----|---|---
-Aaron Mulder|[ammulder](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=ammulder)|[Chariot Solutions](http://chariotsolutions.com)
-Adrian Co|[aco](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=aco)| 
-Alan D. Cabrera|[maguro](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=maguro)| 
-Arthur Naseef|[artnaseef](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=artnaseef)|[Savoir Technologies](http://www.savoirtech.com/)
-Brian McCallister|[brianm](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=brianm)|[Ning](http://ning.com)
-Bruce Snyder|[bsnyder](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=bsnyder)|[SpringSource](http://springsource.com/)
-[Charles Moulliard](http://cmoulliard.blogspot.com)|[cmoulliard](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=cmoulliard)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/) 
-Christopher Shannon|[cshannon](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=cshannon)| 
-Christian Posta|[ceposta](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=ceposta)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-[Claus Ibsen](http://davsclaus.blogspot.com/)|[davsclaus](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=davsclaus)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-Colin MacNaughton|[cmacnaug](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=cmacnaug)| 
-[Dejan Bosanac](http://www.nighttale.net)|[dejanb](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=dejanb)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-Dag Liodden|[daggerrz](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=daggerrz)|[Giant Leap Technologies](http://www.giantleap.no)
-Dain Sundstrom|[dain](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=dain)| 
-Darwin Flores|[dflores](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=dflores)| 
-David Jencks|[djencks](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=djencks)|[IBM](http://www.ibm.com)
-Dennis Cook|[dcook](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=dcook)|[BeVocal](http://bevocal.com)
-Frederick Oconer|[foconer](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=foconer)| 
-Gary Tully|[gtully](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=gtully)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-Geir Magnusson Jr.|[geir](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=geir)| 
-Greg Wilkins|[gregw](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=gregw)|[MortBay](http://mortbay.com)
-Guillaume Nodet|[gnodet](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=gnodet)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-Hadrian Zbarcea|[hadrian](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=hadrian)|[Talend](http://www.talend.com/)
-[Hiram Chirino](http://hiramchirino.com)|[chirino](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=chirino)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-[Jacek Laskowski](http://www.JacekLaskowski.pl)|[jlaskowski](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=jlaskowski)| 
-[James Strachan](http://macstrac.blogspot.com/)|[jstrachan](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=jstrachan)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-Jason van Zyl|[jason](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=jason)| 
-Jean-Baptiste Onofré|[jbonofre](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=jbonofre)|[Talend](http://www.talend.com/)
-Jeff Genender|[jgenender](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=jgenender)|[Savoir Technologies](http://www.savoirtech.com/)
-[Jim Gomes](https://plus.google.com/113674252934234025601/posts)|[jgomes](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=jgomes)| 
-Joe Walnes|[joe](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=joe)|[Google](http://www.google.com)
-Jonas Lim|[jlim](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=jlim)| 
-[Jonathan Anstey](http://janstey.blogspot.com/)|[janstey](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=janstey)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-Joseph Gapuz|[jgapuz](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=jgapuz)| 
-Matt Pavlovich|mattrpav|[Media Driver](http://www.mediadriver.com)
-Max Kington|[mkington](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=mkington)|[BetFair](http://betfair.com)
-Merwin Yap|[myap](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=myap)| 
-[Michael Gaffney](http://www.gaffneyware.com/)|[mgaffney](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=mgaffney)|[BoxTone](http://www.boxtone.com)
-Nathan Mittler|[nmittler](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=nmittler)| 
-Nicky Sandhu|[nsandhu](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=nsandhu)| 
-Patrick Villacorta|[pvillacorta](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=pvillacorta)| 
-Peter Brooke|[pbrooke](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=pbrooke)|Prepulse
-Ramzi Saba|[rsaba](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=rsaba)|[Optaros](http://www.optaros.com)
-[Rob Davies](http://rajdavies.blogspot.com/)|[rajdavies](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=rajdavies)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-Roman Kalukiewicz|[romkal](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=romkal)| 
-Tatu Saloranta|[cowtowncoder](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=cowtowncoder)| 
-[Timothy Bish](http://timbish.blogspot.com/)|[tabish](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=tabish)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-[Willem Jiang](http://willemjiang.blogspot.com/)|[ningjiang](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=ningjiang)|[Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/fuse/)
-William Tam|[wtam](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=wtam)| 
-Marc Schöchlin|mschoechlin| 
-
-### Contributors
-
-"A developer is a user who contributes to a project in the form of code or documentation. They take extra steps to participate in a project, are active on the developer mailing list, participate in discussions, provide patches, documentation, suggestions, and criticism. Developers are also known as contributors." – from [How the ASF works](http://www.apache.org/foundation/how-it-works.html)
-
-Name|Organisation
----|---
-Aaron Crickenberger| 
-Al Maw| 
-Aleksi Kallio| 
-[Alex Dean](http://www.deanspot.org/blog/alex)|[IPS Meteostar](http://www.meteostar.com)
-Andrew Deason| 
-Andy Depue| 
-Axel Hohaus| 
-Arjan Moraal| 
-Barry Kaplan| 
-[Bennet Schulz](https://twitter.com/bennetelli)|[codecentric](https://www.codecentric.de/)
-Brian Diesenhaus| 
-Brian Guan| 
-Brian D. Johnson| 
-Brian Madigan| 
-Bryan Schmidt| 
-Chris Kingsbury|[TradingScreen](http://www.tradingscreen.com)
-Christopher G. Stach II| 
-Charles Anthony| 
-Charles Moulliard|[Xpectis](http://www.xpectis.com)
-Claus Ibsen| 
-Dennis Byrne|[Thoughtworks](http://www.thoughtworks.com)
-Erik Onnen| 
-Gert Vanthienen| 
-Glen Klyuzner|[Tullib](http://www.tullib.com)
-Hakan Guleryuz|ASPone
-Jakub Korab|[Ameliant](http://ameliant.com)
-James Chamberlain| 
-James Zhang| 
-Jamie McCrindle| 
-Jason Anderson| 
-Jason Carreira| 
-Jason Sherman| 
-Jérôme Delagnes| 
-Jeff Sparkes| 
-Jeff Lansing|[SYS Technologies](http://www.systechnologies.com/)
-Jeremy Volkman| 
-Joe Fernandez|[Red Hat](http://www.redhat.com/en/technologies/jboss-middleware/amq)
-John Heitmann| 
-Juraj Tomasov| 
-Kevin Ross| 
-Leo Pechersky| 
-Li Ma| 
-Marco Buss|[product + concept](http://www.productandconcept.com/)
-Marco Luebcke| 
-Mark Bucayan| 
-Mark Frazier|Savoir Technologies
-Mark Timmings| 
-Mario Siegenthaler| 
-Martin Krasser| 
-Mats Henricson| 
-Matt Hoffman| 
-Matthew Vincent| 
-Mathew Kuppe|[360 Treasury Systems](http://www.360t.com/)
-Mike Perham| 
-Neil Clayton|[Royal Bank of Scotland](http://www.rbs.co.uk/CBFM)
-Neil Thorne| 
-Nick Reid|[Evolution](http://www.evolution.net)
-Niklas Gustavsson| 
-Ning Li| 
-Noah Nordrum| 
-Oliver Belikan| 
-Ozgur Cetinturk| 
-Paul Smith| 
-Paul Wai| 
-Pawel Tucholski| 
-Peter Henning| 
-Przemyslaw Budzik| 
-Radek Sedmak| 
-Robin Roos|[Dresdner Kleinwort Wasserstein](http://www.drkw.com/)
-[Robert Liguori](http://www.oreillynet.com/pub/au/3212)|STG Technologies, Inc.
-Ross Mason| 
-Sami Dalouche| 
-Sanjiv Jivan| 
-Steven Marcus| 
-Taylor Gautier| 
-Thomas Heller| 
-[Trevor Pounds](http://www.trevorpounds.com)| 
-
-### Contributing
-
-We welcome contributions, please do come and [join the fun](contributing).
\ No newline at end of file
diff --git a/src/terminology.md b/src/terminology.md
deleted file mode 100644
index c57a86e..0000000
--- a/src/terminology.md
+++ /dev/null
@@ -1,103 +0,0 @@
----
-layout: default_md
-title: Terminology 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [Terminology](terminology)
-
-
-Questions on Message Orientated Middleware and ActiveMQ terminology
-
-*   [DR](dr)
-*   [HA](ha)
-*   [Latency](latency)
-*   [MOM](mom)
-*   [QoS](qos)
-*   [SEDA](seda)
-*   [Throughput](throughput)
-
-### Store and Forward
-
-brokers receive messages, store them locally and forwards the message to a recipient (in this case another broker) when it is able to do so. The message is only deleted once its been sucessfully delivered.
-
-### Reliable messaging
-
-Best efforts are made to deliver a message whilst the system (broker/cluster/network) is running.
-
-### Guaranteed
-
-No matter what happens to the physical network connections or the destination service the message will be delivered to the receiptant - provided there is no catastraphic loss to the persistent data store of a broker along the message(s) route. This means a message could be lost if there was a catastrophic failure to a broker's activemq data disk.
-
-### Fault Tolerance
-
-Unexpected failures never lead to lost or corrupted data - for a messaging system - there are additional caveats for corrupted data - message ordering and once and only once message delivery.
-
-### Network Orphan
-
-A broker can become isolated from other brokers in the cluster due to an network outage. The broker and it's connected clients may not be able to detect if the loss of other brokers in the cluster is due to the broker(or their machines) or simply a router/cable problem. This is a big issue for clustering, as it has the potential to create corrupted data exchanges when the network is re-established.
-
-### Clustering
-
-multiple brokers are used to provide a single logical service.  
-There are three reasons for using clustering:
-
-##### Increased capacity
-
-This is load balancing - this is currently achived by networking brokers together - this won't change in ActiveMQ 4.0 (see below).
-
-##### Geographical Distribution
-
-Again this is achived in ActiveMQ by broker networks.
-
-##### High Availability
-
-The guarenteed maximum amount of downtime that will not be exceeded:
-
-Uptime
-
-Average Down time
-
-implications
-
-95%
-
-8 hours a week
-
-System will be offline for nightly backups a broker loss could result in loss of all messages since last back-up
-
-99%
-
-1.5 hours a week
-
-system maybe offline for backup or maintenance
-
-99.9%
-
-40 mins/month
-
-all back-ups done online
-
-99.999%
-
-5 mins/year
-
-full redundancy
-
-##### Architecture basics
-
-Clusters can be either based around shared storage (shared database or disk) or shared nothing (every broker has their own private storage). There is also two basic mechanisms used for message integrity for failure scenarios:
-
-###### Master/Slave
-
-A broker has a standby replacement - another broker that is kept in step by the cluster that will take over in the event of a broker failure.
-
-###### Synchronous
-
-Every broker is kept exactly in-step with message exchanges across the entire cluster. This is the most secure for failure scenrios, but suffers from performance problems because it the responsibility of the cluster to ensure that messages are fully replicated across every node. This results in higher latency and increased traffic. In practice, it is unsual to have more than 2 brokers in such a cluster, because the performance degradation is directly related to the number of brokers in t [...]
-
-###### Hybrid
-
-A fully synchronous cluster, but it is the responsibility of the client (not the brokers) to ensure every broker is kept up to date. This has advantages for performance, but is complicated by the additional exchange between client and broker(s) to ensure that only one broker does the message dispatching for a client.
-
diff --git a/src/tips-for-getting-help.md b/src/tips-for-getting-help.md
deleted file mode 100644
index 9b33988..0000000
--- a/src/tips-for-getting-help.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: default_md
-title: Tips for getting help 
-title-class: page-title-activemq5
-type: activemq5
---- 
-
-[Community](community) > [Tips for getting help](tips-for-getting-help)
-
-
-We are a community based open source project and we really welcome and value your [Contributions](contributing). We have various ways of getting help via the [Discussion Forums](discussion-forums) or [Mailing Lists](mailing-lists).
-
-Here are a few tips to help us to help you
-
-*   which version of ActiveMQ are you using? (and if you are using a SNAPSHOT, which date?)
-*   are you using queues or topics and are you using persistent or non persistent messaging?
-*   details of your environment can help too such as
-    *   operating system
-    *   JVM version (1.6, 1.5, or 1.4)
-    *   application server; spring, tomcat, J2EE etc?
-*   remember you can always get full [commercial support](support) if you want a dedicated support team.
-
diff --git a/src/user-forum.md b/src/user-forum.md
deleted file mode 100644
index 8deed2b..0000000
--- a/src/user-forum.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: default_md
-title: User Forum 
-title-class: page-title-activemq5
-type: activemq5
---- 
-
-[Community](community) > [Mailing Lists](mailing-lists) > [User Forum](user-forum)
-
-
-[ActiveMQ - User](http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html)
-
diff --git a/src/users.md b/src/users.md
deleted file mode 100644
index d3eada1..0000000
--- a/src/users.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: default_md
-title: Users
-title-class: page-title-activemq5
-type: activemq5
---- 
-
-[Community](community) > [Users](users)
-
-This page contains a list of some of our users and gives a brief overview of how they are using ActiveMQ. The purpose of this page is to help the ActiveMQ community get to know each other & find out what we're all doing with ActiveMQ and for the developers of ActiveMQ to get a better feel for what kinds of things people are doing with ActiveMQ.
-
-Name|Company name or description|Use of ActiveMQ
----|---|---
-|[FuseSource](http://fusesource.com/)|FuseSource provide enterprise class support, training and mentoring around an open source Apache SOA stack including [ServiceMix](http://servicemix.apache.org/), [ActiveMQ](http://activemq.apache.org/) and [Camel](http://activemq.apache.org/camel/)
-Matt Biddulph|[Dopplr](http://www.dopplr.com/)|Use ActiveMQ as their messaging provider - see Matt's great presentation [Made of Messages](http://www.slideshare.net/carsonified/dopplr-its-made-of-messages-matt-biddulph-presentation)
-|[gnip](http://gnip.com)|Use [ActiveMQ for their low latency MOM messaging](http://www.byteonic.com/2008/gnip-online-message-oriented-middleware-mom/)
-Peter Brooke|RomTrac|We are using ActiveMQ and Camel to provider high performance load balancing of requests across a cluster of servers
-Sridhar Komandur|University of Washington (UW Tech)|ActiveMQ is being used as backend messaging layer for a variety of distributed applications withing UW
-Gareth Davies|Daugherty Systems|At current client (global agribusiness firm), using ActiveMQ for asynchronous, reliable messaging within in-house SOA application
-Raffe G.|Document archiving/flow systems|We try to use ActiveMQ as connectivity option between our FrontEnd (FE) and BackEnd (BE). FE receives requests which processing is normally heavy time-consuming. Thus FE creates a message which is sent to BE for processing and returns a ticket (correlationID) to the user. This will later use the ticket to ask for the response of the processing (again sending a message from FE to BE which will respond synchronously in this case). So we want to have [...]
-Tom L.|Promotional Marketing|Here is our flow. The backend systems (written in a propriatery language) send requests to a tomcat server via http. The message servlet from the ActiveMQ's web API connects to an embeded broker instance using the VM connector and places the request on the queue. We don't have a need for clustering yet, but we are planning on using either tomcat's clustering or ActiveCluster if it becomes necessary (since the brokers are embeded anyways).
-Aleksi Kallio|CSC, the Finnish IT center for science|We are building a bioinformatics system for DNA-microarray data storage and analysis. System contains rich graphical clients, a large database and heavy server machinery for processing analysis jobs. We are trying to use ActiveMQ as a JMS implementation to shuttle data between the servers and clients in an event based manner.
-[Frik Strecker](mailto:frik@gatherworks.com)|[GatherPlace](http://www.gatherplace.net) provides cost-effective remote application sharing|ActiveMQ is used to collect real-time billing and usage information from servers distributed throughout the world. Free accounts are available to active ActiveMQ developers for ActiveMQ purposes.
-[Golconde](http://code.google.com/p/golconde/)||Uses ActiveMQ to implement a distributed Postgresql replication system
-[Robert Liguori](http://www.oreillynet.com/pub/au/3212)|STG Technologies, Inc.|Uses ActiveMQ in support of the aviation industry.
-
diff --git a/src/using-activemq-5.md b/src/using-activemq-5.md
index 0b47954..652ff5a 100644
--- a/src/using-activemq-5.md
+++ b/src/using-activemq-5.md
@@ -28,5 +28,5 @@ To help you get started using Apache ActiveMQ version 5 you may wish to start of
 
 ### Commercial Documentation
 
-The Commercial Providers listed on the [Support](support) page may also have additional documentation, examples, tutorials, etc... that can help you get started using ActiveMQ.
+The commercial providers listed on the [issues](issues) page may also have additional documentation, examples, tutorials, etc... that can help you get started using ActiveMQ.
 
diff --git a/src/using-apache-activemq.md b/src/using-apache-activemq.md
deleted file mode 100644
index 80914f2..0000000
--- a/src/using-apache-activemq.md
+++ /dev/null
@@ -1,73 +0,0 @@
----
-layout: default_md
-title: Using Apache ActiveMQ 
-title-class: page-title-activemq5
-type: activemq5
----
-
- [FAQ](faq) > [Using Apache ActiveMQ](using-apache-activemq)
-
-
-Questions on using Apache ActiveMQ
-
-*   [ActiveMQ Command Line Tools Reference](activemq-command-line-tools-reference)
-*   [Are destinations case sensitive](are-destinations-case-sensitive)
-*   [Can I send really large files over ActiveMQ](can-i-send-really-large-files-over-activemq)
-*   [Can I use ActiveMQ 5.x or later on Java 1.4](can-i-use-activemq-5x-or-later-on-java-14)
-*   [Can two brokers share the same database](can-two-brokers-share-the-same-database)
-*   [Does ActiveMQ support clustering](does-activemq-support-/Features/clustering)
-*   [How can I avoid serialization of Objects in ObjectMessage](how-can-i-avoid-serialization-of-objects-in-Features/Message Features/objectmessage)
-*   [How can I get a list of the topics and queues in a broker](how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker)
-*   [How can I make ActiveMQ faster](how-can-i-make-activemq-faster)
-*   [How can I monitor ActiveMQ](how-can-i-monitor-activemq)
-*   [How can I monitor the connection with the broker](how-can-i-monitor-the-connection-with-the-broker)
-*   [How can I see what destinations are used](how-can-i-see-what-destinations-are-used)
-*   [How can I support auto reconnection](how-can-i-support-auto-reconnection)
-*   [How can I support priority queues](how-can-i-support-priority-queues)
-*   [How can I use different network protocols](how-can-i-use-different-network-Connectivity/protocols)
-*   [How do distributed queues work](how-do-distributed-queues-work)
-*   [How do I access ActiveMQ from C](how-do-i-access-activemq-from-c)
-*   [How do I access ActiveMQ from CSharp or dotNet](how-do-i-access-activemq-from-csharp-or-dotnet)
-*   [How do I access ActiveMQ from Ruby, Perl, Python, PHP](how-do-i-access-activemq-from-ruby-perl-python-Connectivity/Cross Language Clients/php)
-*   [How do I bridge different JMS providers](how-do-i-bridge-different-jms-providers)
-*   [How do I change dispatch policy](how-do-i-change-dispatch-policy)
-*   [How do I change the logging](how-do-i-change-the-logging)
-*   [How do I connect to one of a number of message brokers](how-do-i-connect-to-one-of-a-number-of-message-brokers)
-*   [How do I create new destinations](how-do-i-create-new-destinations)
-*   [How do I delete a destination](how-do-i-delete-a-destination)
-*   [How do I disable logging](how-do-i-disable-logging)
-*   [How do I embed a Broker inside a Connection](how-do-i-embed-a-broker-inside-a-connection)
-*   [How do I enable asynchronous sending](how-do-i-enable-asynchronous-sending)
-*   [How do I enable debug logging](how-do-i-enable-debug-logging)
-*   [How do I find the Size of a Queue](how-do-i-find-the-size-of-a-queue)
-*   [How do I preserve order of messages](how-do-i-preserve-order-of-messages)
-*   [How do I purge a queue](how-do-i-purge-a-queue)
-*   [How do I restart embedded broker](how-do-i-restart-embedded-broker)
-*   [How do I restrict connections from creating new queues or topics](how-do-i-restrict-connections-from-creating-new-queues-or-topics)
-*   [How do I run a broker](how-do-i-run-a-broker)
-*   [How do I set the message expiration](how-do-i-set-the-message-expiration)
-*   [How do I turn off creating an embedded ActiveMQ broker when using the VM transport](how-do-i-turn-off-creating-an-embedded-activemq-broker-when-using-the-vm-transport)
-*   [How do I unack the message with Stomp](how-do-i-unack-the-message-with-stomp)
-*   [How do I use ActiveMQ using in JVM messaging](how-do-i-use-activemq-using-in-jvm-messaging)
-*   [How do I use durable subscribers in a network of brokers](how-do-i-use-durable-subscribers-in-a-network-of-brokers)
-*   [How do I use Ivy with ActiveMQ](how-do-i-use-ivy-with-activemq)
-*   [How do I use log4j JMS appender with ActiveMQ](how-do-i-use-log4j-jms-appender-with-activemq)
-*   [How do I use SSL](how-do-i-use-ssl)
-*   [How do Message Groups compare to Selectors](how-do-message-groups-compare-to-Features/Consumer Features/selectors)
-*   [How do multiple transports work](how-do-multiple-transports-work)
-*   [How Do Transactions Work](how-do-transactions-work)
-*   [How lightweight is sending a message](how-lightweight-is-sending-a-message)
-*   [How should I package applications using Camel and ActiveMQ](how-should-i-package-applications-using-camel-and-activemq)
-*   [How should I use the VM transport](how-should-i-use-the-vm-transport)
-*   [How to deal with large number of threads in clients](how-to-deal-with-large-number-of-threads-in-clients)
-*   [How to disable auto destination creation](how-to-disable-auto-destination-creation)
-*   [I see NC_ client-ids, what does that mean](i-see-nc-client-ids-what-does-that-mean)
-*   [Should I deploy Enterprise Integration Patterns in the broker or another application](should-i-deploy-enterprise-integration-patterns-in-the-broker-or-another-application)
-*   [Should I deploy the broker inside my JVM or AppServer](should-i-deploy-the-broker-inside-my-jvm-or-appserver)
-*   [What are those topics ActiveMQ.Advisory](what-are-those-topics-activemqadvisory)
-*   [What happens with a fast producer and slow consumer](what-happens-with-a-fast-producer-and-slow-consumer)
-*   [What is the difference between a Virtual Topic and a Composite Destination](what-is-the-difference-between-a-virtual-topic-and-a-composite-destination)
-*   [What is the difference between discovery, multicast and zeroconf](what-is-the-difference-between-discovery-multicast-and-zeroconf)
-*   [What is the Prefetch Limit For?](what-is-the-prefetch-limit-for)
-*   [While posting large binary file to activeMQ, is there a way to measure its progress](while-posting-large-binary-file-to-activemq-is-there-a-way-to-measure-its-progress)
-