doc changes on architecture including picture changes

I have changed the OpenOffice files. Exported the pictures
As I exported the pictures I selected the group on the slide,
File->Export, JPG file, and selected selection only.

The size was the default size and that worked alright.

docs/user-manual/en/architecture.md

@@ -28,14 +28,21 @@ ActiveMQ clients, potentially on different physical machines interact
 with the ActiveMQ server. ActiveMQ currently provides two APIs for
 messaging at the client side:
 
-1.  Core client API. This is a simple intuitive Java API that allows the
+1. Core client API. This is a simple intuitive Java API that allows the
     full set of messaging functionality without some of the complexities
     of JMS.
 
-2.  JMS client API. The standard JMS API is available at the client
+2. JMS client API. The standard JMS API is available at the client
     side.
 
-JMS semantics are implemented by a thin JMS facade layer on the client
+ActiveMQ also provides different protocol implementations on the server so you can use respective clients for these protocols:
+
+1. Stomp
+2. OpenWire
+3. AMQP
+
+
+JMS semantics are implemented by a JMS facade layer on the client
 side.
 
 The ActiveMQ server does not speak JMS and in fact does not know
@@ -66,7 +73,7 @@ application that requires messaging functionality internally but you
 don't want to expose that as a ActiveMQ server you can directly
 instantiate and embed ActiveMQ servers in your own application.
 
-For more information on embedding ActiveMQ, see [Embedding HornetQ](embedding-hornetq.md).
+For more information on embedding ActiveMQ, see [Embedding ActiveMQ](embedding-activemq.md).
 
 ## ActiveMQ integrated with a JEE application server
 

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

@@ -170,7 +170,7 @@ Let's take a brief look at these:
 ### Java Message Service (JMS)
 
 [JMS](http://en.wikipedia.org/wiki/Java_Message_Service) is part of
-Sun's JEE specification. It's a Java API that encapsulates both message
+Oracle's JEE specification. It's a Java API that encapsulates both message
 queue and publish-subscribe messaging patterns. JMS is a lowest common
 denominator specification - i.e. it was created to encapsulate common
 functionality of the already existing messaging systems that were

docs/user-manual/en/persistence.md

@@ -354,31 +354,24 @@ message data, duplicate id caches or paging data will be persisted.
 
 You may want to inspect the existent records on each one of the journals
 used by ActiveMQ, and you can use the export/import tool for that
-purpose. The export/import are classes located at the activemq-core.jar,
+purpose.
 you can export the journal as a text file by using this command:
 
-`java -cp activemq-core.jar org.apache.activemq.core.journal.impl.ExportJournal
+`java -cp activemq-tools-jar-with-dependencies.jar export-journal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>`
-                <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize>
-                <FileOutput>`
 
 To import the file as binary data on the journal (Notice you also
 require netty.jar):
 
-`java -cp activemq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal
+`java -cp activemq-tools-jar-with-dependencies.jar import-journal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileInput>`
-                <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize>
-                <FileInput>`
 
--   JournalDirectory: Use the configured folder for your selected
+-   JournalDirectory: Use the configured folder for your selected folder. Example: ./activemq/data/journal
-    folder. Example: ./activemq/data/journal
 
--   JournalPrefix: Use the prefix for your selected journal, as
+-   JournalPrefix: Use the prefix for your selected journal, as discussed above
-    discussed above
 
--   FileExtension: Use the extension for your selected journal, as
+-   FileExtension: Use the extension for your selected journal, as discussed above
-    discussed above
 
 -   FileSize: Use the size for your selected journal, as discussed above
 
--   FileOutput: text file that will contain the exported data
+-   FileOutput or FileInput: text file that will contain the exported data
-
 
+See [Tools](tools.md) for more information.