This closes #1157

docs/user-manual/en/SUMMARY.md

@@ -10,7 +10,7 @@
 * [Address Model](address-model.md)
 * [Using JMS](using-jms.md)
 * [Using Core](using-core.md)
-* [Using AMQP](using-amqp.md)
+* [Using AMQP](using-AMQP.md)
 * [Mapping JMS Concepts to the Core API](jms-core-mapping.md)
 * [The Client Classpath](client-classpath.md)
 * [Examples](examples.md)

docs/user-manual/en/architecture.md

@@ -139,5 +139,3 @@ you'll most likely end up creating a new connection and session every
 time you want to interact from the EJB, which is an anti-pattern.
 
 ![ActiveMQ Artemis architecture2](images/architecture2.jpg)
-
-For more information on using the JCA adaptor, please see [Application Server Integration and Java EE](appserver-integration.md).

docs/user-manual/en/messaging-concepts.md

@@ -244,7 +244,7 @@ theoretically any Stomp client can work with any messaging system that
 supports Stomp. Stomp clients are available in many different
 programming languages.
 
-Please see [Stomp](interoperability.md) for using STOMP with Apache ActiveMQ Artemis.
+Please see [Stomp](protocols-interoperability.md) for using STOMP with Apache ActiveMQ Artemis.
 
 ### OPENWIRE
 

docs/user-manual/en/preface.md

@@ -9,10 +9,6 @@ What is Apache ActiveMQ Artemis?
 -   Apache ActiveMQ Artemis is an example of Message Oriented Middleware (MoM). For a
     description of MoMs and other messaging concepts please see the [Messaging Concepts](messaging-concepts.md).
 
--   For answers to more questions about what Apache ActiveMQ Artemis is and what it
-    isn't please visit the [FAQs wiki
-    page](todo).
-
 Why use Apache ActiveMQ Artemis? Here are just a few of the reasons:
 
 -   100% open source software. Apache ActiveMQ Artemis is licensed using the Apache