Author: chirino
Date: Tue May 30 06:33:28 2006
New Revision: 410277
URL: http://svn.apache.org/viewvc?rev=410277&view=rev
Log:
Merged in rev 409832
Modified:
incubator/activemq/branches/activemq-4.0/README.txt
incubator/activemq/branches/activemq-4.0/assembly/src/release/README.txt
incubator/activemq/branches/activemq-4.0/assembly/src/release/userGuide.html
Modified: incubator/activemq/branches/activemq-4.0/README.txt
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/README.txt?rev=410277&r1=410276&r2=410277&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/README.txt (original)
+++ incubator/activemq/branches/activemq-4.0/README.txt Tue May 30 06:33:28 2006
@@ -1,11 +1,11 @@
-Welcome to ActiveMQ
-===================
-ActiveMQ is a high performance Apache 2.0 licenced Message Broker and JMS 1.1
implementation.
+Welcome to Apache ActiveMQ
+==========================
+Apache ActiveMQ is a high performance Apache 2.0 licenced Message Broker and
JMS 1.1 implementation.
Incubation Disclaimer
=====================
-ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
(ASF), sponsored by the Geronimo PMC.
+Apache ActiveMQ is an effort undergoing incubation at the Apache Software
Foundation (ASF), sponsored by the Geronimo PMC.
Incubation is required of all newly accepted projects until a further review
indicates that the infrastructure,
communications, and decision making process have stabilized in a manner
consistent with other successful ASF projects.
@@ -19,22 +19,23 @@
To help you get started, try the following links:-
Getting Started
-http://incubator.apache.org/activemq/Getting+Started
+http://incubator.apache.org/activemq/getting-started.html
Building
-http://incubator.apache.org/activemq/Building
+http://incubator.apache.org/activemq/getting-started.html#GettingStarted-WindowsSourceInstallation
+http://incubator.apache.org/activemq/getting-started.html#GettingStarted-UnixSourceInstallation
Examples
-http://incubator.apache.org/activemq/Examples
+http://incubator.apache.org/activemq/examples.html
We welcome contributions of all kinds, for details of how you can help
-http://incubator.apache.org/activemq/Contributing
+http://incubator.apache.org/activemq/contributing.html
Please refer to the website for details of finding the issue tracker, email
lists, wiki or IRC channel
http://incubator.apache.org/activemq/
-Please help us make ActiveMQ better - we appreciate any feedback you may have.
+Please help us make Apache ActiveMQ better - we appreciate any feedback you
may have.
Enjoy!
------------------
-The ActiveMQ team
+------------------------
+The Apache ActiveMQ team
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/README.txt
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/README.txt?rev=410277&r1=410276&r2=410277&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/README.txt
(original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/README.txt
Tue May 30 06:33:28 2006
@@ -1,11 +1,11 @@
-Welcome to ActiveMQ
-===================
-ActiveMQ is a high performance Apache 2.0 licenced Message Broker and JMS 1.1
implementation.
+Welcome to Apache ActiveMQ
+==========================
+Apache ActiveMQ is a high performance Apache 2.0 licenced Message Broker and
JMS 1.1 implementation.
Incubation Disclaimer
=====================
-ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
(ASF), sponsored by the Geronimo PMC.
+Apache ActiveMQ is an effort undergoing incubation at the Apache Software
Foundation (ASF), sponsored by the Geronimo PMC.
Incubation is required of all newly accepted projects until a further review
indicates that the infrastructure,
communications, and decision making process have stabilized in a manner
consistent with other successful ASF projects.
@@ -19,22 +19,23 @@
To help you get started, try the following links:-
Getting Started
-http://incubator.apache.org/activemq/Getting+Started
+http://incubator.apache.org/activemq/getting-started.html
Building
-http://incubator.apache.org/activemq/Building
+http://incubator.apache.org/activemq/getting-started.html#GettingStarted-WindowsSourceInstallation
+http://incubator.apache.org/activemq/getting-started.html#GettingStarted-UnixSourceInstallation
Examples
-http://incubator.apache.org/activemq/Examples
+http://incubator.apache.org/activemq/examples.html
We welcome contributions of all kinds, for details of how you can help
-http://incubator.apache.org/activemq/Contributing
+http://incubator.apache.org/activemq/contributing.html
Please refer to the website for details of finding the issue tracker, email
lists, wiki or IRC channel
http://incubator.apache.org/activemq/
-Please help us make ActiveMQ better - we appreciate any feedback you may have.
+Please help us make Apache ActiveMQ better - we appreciate any feedback you
may have.
Enjoy!
------------------
-The ActiveMQ team
+------------------------
+The Apache ActiveMQ team
Modified:
incubator/activemq/branches/activemq-4.0/assembly/src/release/userGuide.html
URL:
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/userGuide.html?rev=410277&r1=410276&r2=410277&view=diff
==============================================================================
---
incubator/activemq/branches/activemq-4.0/assembly/src/release/userGuide.html
(original)
+++
incubator/activemq/branches/activemq-4.0/assembly/src/release/userGuide.html
Tue May 30 06:33:28 2006
@@ -9,13 +9,13 @@
</h1>
<p>
-Welcome to ActiveMQ. This document gives you a quick overview of how to get
started trying out ActiveMQ.
+Welcome to Apache ActiveMQ. This document gives you a quick overview of how to
get started trying out Apache ActiveMQ.
</p>
<h2>Running the broker</h2>
<p>
-From the binary distribution you can run the ActiveMQ server pretty easily via
the bin/activemq command.
+From the binary distribution you can run the Apache ActiveMQ server pretty
easily via the bin/activemq command.
e.g. from a shell type
</p>
<pre>
@@ -24,7 +24,7 @@
</pre>
<p>
-The ActiveMQ broker should now have started
+The Apache ActiveMQ broker should now have started
</p>
<h2>Running the example programs</h2>
