Return-Path: 
 <commits-return-4605-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 78775 invoked from network); 7 Feb 2007 18:46:15 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Feb 2007 18:46:15 -0000
Received: (qmail 14959 invoked by uid 500); 7 Feb 2007 18:46:22 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 14911 invoked by uid 500); 7 Feb 2007 18:46:22 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 14901 invoked by uid 99); 7 Feb 2007 18:46:22 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Feb 2007 10:46:22 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Feb 2007 10:46:14 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id A68F41A981A; Wed,  7 Feb 2007 10:45:54 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r504643 -
 /activemq/trunk/activemq-book/src/docbkx/activemq.xml
Date: Wed, 07 Feb 2007 18:45:54 -0000
To: commits@activemq.apache.org
From: jstrachan@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070207184554.A68F41A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jstrachan
Date: Wed Feb  7 10:45:53 2007
New Revision: 504643

URL: http://svn.apache.org/viewvc?view=rev&rev=504643
Log:
Added a bit more documentation

Modified:
    activemq/trunk/activemq-book/src/docbkx/activemq.xml

Modified: activemq/trunk/activemq-book/src/docbkx/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-book/src/docbkx/activemq.xml?view=diff&rev=504643&r1=504642&r2=504643
==============================================================================
--- activemq/trunk/activemq-book/src/docbkx/activemq.xml (original)
+++ activemq/trunk/activemq-book/src/docbkx/activemq.xml Wed Feb  7 10:45:53 2007
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,69 +15,81 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <book>
   <bookinfo>
     <title>Apache ActiveMQ - User Guide</title>
-    <releaseinfo>4.2</releaseinfo>
+    <releaseinfo>&version;</releaseinfo>
+
     <authorgroup>
       <author>
         <firstname>James</firstname>
         <surname>Strachan</surname>
       </author>
+
       <author>
         <firstname>Brian</firstname>
         <surname>McCallister</surname>
       </author>
     </authorgroup>
+
     <legalnotice>
-      <para>
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements. See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License. You may obtain a copy of the License at
-      </para>
-
-      <para>
-        http://www.apache.org/licenses/LICENSE-2.0
-      </para>
-
-      <para>
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-      </para>
+      <para>Licensed to the Apache Software Foundation (ASF) under one or more
+      contributor license agreements. See the NOTICE file distributed with
+      this work for additional information regarding copyright ownership. The
+      ASF licenses this file to You under the Apache License, Version 2.0 (the
+      "License"); you may not use this file except in compliance with the
+      License. You may obtain a copy of the License at</para>
+
+      <para>http://www.apache.org/licenses/LICENSE-2.0</para>
+
+      <para>Unless required by applicable law or agreed to in writing,
+      software distributed under the License is distributed on an "AS IS"
+      BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied. See the License for the specific language governing permissions
+      and limitations under the License.</para>
     </legalnotice>
   </bookinfo>
-  <toc/>
 
+  <toc></toc>
 
   <chapter id="introduction">
     <title>Introduction</title>
+
     <para></para>
 
-    <para>Apache ActiveMQ is the most popular and powerful open source Message
-      Broker available today. Its hosted at Apache and is distributed under the
-      Apache Software License (2.0).
-    </para>
-
-    <section id="introduction-overview">
-      <title>Overview</title>
-      <para></para>
+    <para><ulink url="http://activemq.apache.org/">Apache ActiveMQ</ulink> is
+    the most popular and powerful open source Message Broker available today.
+    Its hosted at Apache and is distributed under the Apache Software License
+    (2.0).</para>
+
+    <para>ActiveMQ supports different <ulink
+    url="http://activemq.apache.org/cross-language-clients.html">cross
+    language clients</ulink> from many different languages such as Java, C# /
+    .Net, C, C++, Ruby, Python, Perl, PHP together with different protocols
+    like OpenWire, Stomp, REST, Ajax/Cometd, XMPP. ActiveMQ also provides a
+    whole raft of powerful <ulink
+    url="http://activemq.apache.org/features.html">features</ulink> like
+    Message Groups, Exclusive Queues, Master/Slave, Networks of Brokers and so
+    forth.</para>
+
+    <section>
+      <title>Architecture</title>
+
+      <para>Like most Message Orientated Middleware (<acronym>MOM</acronym>)
+      providers ActiveMQ is based on the idea of one or more <emphasis>Message
+      Brokers</emphasis> running on the network which act as a message router
+      and optional persistence store, then <emphasis>Clients</emphasis>
+      connect to one or more Message Broker.</para>
     </section>
   </chapter>
 
   <chapter id="installation">
     <title>Installing Apache ActiveMQ</title>
 
-    <para>The first thing you need to do is install Apache ActiveMQ from a binary distribution.
-    </para>
+    <para>The first thing you need to do is install Apache ActiveMQ from a
+    binary distribution.</para>
 
     <para></para>
   </chapter>
@@ -86,11 +97,12 @@
   <chapter id="running-broker">
     <title>Running a Broker</title>
 
-
-    <para>The most typical deployment of Apache ActiveMQ, particularly if persistent messaging is to be used is for
-      brokers to be run on the network somewhere. This chapter takes you through running a broker as a stand alone
-      process.
-    </para>
+    <para>The most typical deployment of Apache ActiveMQ is for brokers to be
+    run on the network as a stand alone processes then messaging clients
+    connect to one or more brokers. So we will describe how to go about
+    running brokers, then in the <link linkend="java-client">next
+    chapter</link> we will describe how to connect to a broker from a
+    client.</para>
 
     <para></para>
   </chapter>
@@ -98,9 +110,9 @@
   <chapter id="java-client">
     <title>Using the Java Client</title>
 
-    <para>Apache ActiveMQ fully supports the JMS 1.1 and J2EE 1.4 specifications so feel free to follow any
-      documentation you have on JMS or J2EE for more background.
-    </para>
+    <para>Apache ActiveMQ fully supports the JMS 1.1 and J2EE 1.4
+    specifications so feel free to follow any documentation you have on JMS or
+    J2EE for more background.</para>
 
     <para></para>
   </chapter>