Skip to content

Commit

Permalink
Spelling fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
scop committed Sep 10, 2013
1 parent 387a36f commit b358eec
Show file tree
Hide file tree
Showing 105 changed files with 170 additions and 170 deletions.
10 changes: 5 additions & 5 deletions README.md
Expand Up @@ -156,16 +156,16 @@ Do not use the [maven-eclipse-plugin] to copy the files as it conflicts with [m2
[maven-eclipse-plugin]: https://maven.apache.org/plugins/maven-eclipse-plugin/
[m2e]: http://eclipse.org/m2e/

## Github procedures
## GitHub procedures

The best way to submit changes to HornetQ is through pull-request's on
The best way to submit changes to HornetQ is through pull requests on
GitHub. After review a pull request should either get merged or be
rejected.

When a pull request needs to be reworked, say you have missed
something, the pull request is then closed. When you finished
addressing the required changes you should reopen your original Pull
Request and it will then be re-evaluated. At that point if the request
is aproved we will then merge it.
addressing the required changes you should reopen your original pull
request and it will then be re-evaluated. At that point if the request
is approved we will then merge it.

Make sure you always rebase your branch on master before submitting pull requests.
4 changes: 2 additions & 2 deletions RELEASING.md
Expand Up @@ -4,13 +4,13 @@ Things to do before issuing a new MAJOR release:

* check if all new Configuration parameters are documented;

* use your IDE to regerate equals/hashCode for ConfigurationImpl (this
* use your IDE to regenerate equals/hashCode for ConfigurationImpl (this
is just much safer than trying to inspect the code).

* check if all public API classes have a proper Javadoc.


## Tagging a relese in Git ##
## Tagging a release in Git ##

We must avoid having multiple commits with the same final release version in the POMs. To achieve that, the commit changing the pom versions to the final release version, should be merged together with a second commit changing to version in all pom's to ``X.Y.Z-SNAPSHOT``.

Expand Down
Expand Up @@ -24,7 +24,7 @@

<mbean code="org.hornetq.service.HornetQStarterService"
name="org.hornetq:service=HornetQStarterService">
<!--lets let the JMS Server start us-->
<!--let's let the JMS Server start us-->
<attribute name="Start">false</attribute>

<depends optional-attribute-name="SecurityManagerService"
Expand Down
Expand Up @@ -24,7 +24,7 @@

<mbean code="org.hornetq.service.HornetQStarterService"
name="org.hornetq:service=HornetQStarterService">
<!--lets let the JMS Server start us-->
<!--let's let the JMS Server start us-->
<attribute name="Start">false</attribute>

<depends optional-attribute-name="SecurityManagerService"
Expand Down
10 changes: 5 additions & 5 deletions docs/eap-manual/en/clusters.xml
Expand Up @@ -78,7 +78,7 @@
<section>
<title>Live Server Configuration</title>
<para>
First lets start with the configuration of the live server, we will use the EAP 'all' configuration as
First let's start with the configuration of the live server, we will use the EAP 'all' configuration as
our starting point. Since this version only supports shared store for failover we need to configure
this in the
<literal>hornetq-configuration.xml</literal>
Expand Down Expand Up @@ -133,7 +133,7 @@
</para>
<para>We also need to configure the connection factories used by the client to be HA. This is done by
adding
certain attributes to the connection factories in<literal>hornetq-jms.xml</literal>. Lets look at an
certain attributes to the connection factories in<literal>hornetq-jms.xml</literal>. Let's look at an
example:
</para>
<programlisting>
Expand Down Expand Up @@ -196,7 +196,7 @@
<section>
<title>Backup Server Configuration</title>
<para>
Now lets look at how to create and configure a backup server on the same eap instance. This is running
Now let's look at how to create and configure a backup server on the same eap instance. This is running
on the same eap instance as the live server from the previous chapter but is configured as the backup
for a live server running on a different eap instance.
</para>
Expand Down Expand Up @@ -277,7 +277,7 @@
</para>
</note>
<para>
Now lets add the server configuration in
Now let's add the server configuration in
<literal>hornetq-configuration.xml</literal>
and add it to the same directory
<literal>deploy/hornetq-backup1</literal>
Expand Down Expand Up @@ -566,4 +566,4 @@
</section>
</section>
</section>
</chapter>
</chapter>
2 changes: 1 addition & 1 deletion docs/quickstart-guide/en/download.xml
Expand Up @@ -65,7 +65,7 @@
>https://github.com/hornetq/hornetq</ulink></para>
</listitem>
<listitem>
<para>All release tags are availble from <ulink
<para>All release tags are available from <ulink
url="https://github.com/hornetq/hornetq/tags"
>https://github.com/hornetq/hornetq/tags</ulink></para>
</listitem>
Expand Down
6 changes: 3 additions & 3 deletions docs/user-manual/en/appserver-integration.xml
Expand Up @@ -293,7 +293,7 @@ public class MDBMessageSendTxExample implements MessageListener
<section>
<title>MDB and Consumer pool size</title>
<para>Most application servers, including JBoss, allow you to configure how many MDB's there are in a pool. In
Jboss this is configured via the <literal>MaxPoolSize</literal> parameter in the ejb3-interceptors-aop.xml file. Configuring
JBoss this is configured via the <literal>MaxPoolSize</literal> parameter in the ejb3-interceptors-aop.xml file. Configuring
this has no actual effect on how many sessions/consumers there actually are created. This is because the Resource
Adaptor implementation knows nothing about the application servers MDB implementation. So even if you set the MDB
pool size to 1, 15 sessions/consumers will be created (this is the default). If you want to limit how many
Expand Down Expand Up @@ -1021,7 +1021,7 @@ private ConnectionFactory connectionFactory;</programlisting>
<para>This is a step by step guide on how to configure a JBoss application server that doesn't have HornetQ installed
to use a remote instance of HornetQ</para>
<section>
<title>Configuring Jboss 5</title>
<title>Configuring JBoss 5</title>
<para>Firstly download and install JBoss AS 5 as per the JBoss installation guide and HornetQ as per the
HornetQ installation guide. After that the following steps are required</para>
<itemizedlist>
Expand Down Expand Up @@ -1195,7 +1195,7 @@ Copyright 2009 Red Hat, Inc.
<para>Now you should be able to send messages using the JCA JMS connection pooling within an XA transaction.</para>
</section>
<section>
<title>Configuring Jboss 5</title>
<title>Configuring JBoss 5</title>
<para>The steps to do this are exactly the same as for JBoss 4, you will have to create a jboss.xml definition
file for your MDB with the following entry</para>
<programlisting>
Expand Down
4 changes: 2 additions & 2 deletions docs/user-manual/en/clusters.xml
Expand Up @@ -78,7 +78,7 @@
</listitem>
</itemizedlist>
<para>
This information, lets call it the Cluster Topology, is actually sent around normal HornetQ
This information, let's call it the Cluster Topology, is actually sent around normal HornetQ
connections to clients and to other servers over cluster connections. This being the case we need a
way of establishing the initial first connection. This can be done using
dynamic discovery techniques like <ulink url="http://en.wikipedia.org/wiki/User_Datagram_Protocol" >UDP</ulink>
Expand Down Expand Up @@ -281,7 +281,7 @@
</listitem>
</itemizedlist>
<para>
Although a discovery group will always accept broadcasts, its current list of avaliable live and
Although a discovery group will always accept broadcasts, its current list of available live and
backup servers is only ever used when an initial connection is made, from then server discovery is
done over the normal HornetQ connections.
</para>
Expand Down
2 changes: 1 addition & 1 deletion docs/user-manual/en/configuration-index.xml
Expand Up @@ -445,7 +445,7 @@
A user can then replace the real password in the configuration files with the new masked password.
When HornetQ loads a masked password, it uses a suitable 'decoder' to decode it into real password.</para>

<para>Hornetq provides a default password encoder and decoder. Optionally users can use or implement their own encoder and decoder for
<para>HornetQ provides a default password encoder and decoder. Optionally users can use or implement their own encoder and decoder for
masking the passwords.</para>

<section> <title>Password Masking in Server Configuration File</title>
Expand Down
2 changes: 1 addition & 1 deletion docs/user-manual/en/interoperability.xml
Expand Up @@ -280,7 +280,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces</programlisting
<title>AMQP and Coordinations - Handling Transactions</title>
<para>An AMQP links target can also be a Coordinator, the Coordinator is used to handle transactions. If a
coordinator is used the the underlying HormetQ Server session will be transacted and will be either rolled back
or commited via the coordinator.</para>
or committed via the coordinator.</para>
<note><para>AMQP allows the use of multiple transactions per session, <literal>amqp:multi-txns-per-ssn</literal>,
however in this version HornetQ will only support single transactions per session</para></note>
</section>
Expand Down
2 changes: 1 addition & 1 deletion docs/user-manual/en/management.xml
Expand Up @@ -1078,7 +1078,7 @@ messageCounter.getMessageCountDelta());</programlisting>
<para>
<graphic fileref="images/console1.png" scalefit="1" width="500" align="center"/>
</para>
<para>The name and JNDI name cant be changed, if you want to change these recreate the queue with the appropriate
<para>The name and JNDI name can't be changed, if you want to change these recreate the queue with the appropriate
settings. The rest of the configuration options, apart from security roles, relate to address settings for a particular
address. The default address settings are picked up from the servers configuration, if you change any of these
settings or create a queue via the console a new Address Settings entry will be added. For a full explanation on
Expand Down
2 changes: 1 addition & 1 deletion docs/user-manual/en/queue-attributes.xml
Expand Up @@ -29,7 +29,7 @@
<section id="predefined.queues">
<title>Predefined Queues</title>
<para>Queues can be predefined via configuration at a core level or at a JMS level. Firstly
lets look at a JMS level.</para>
let's look at a JMS level.</para>
<para>The following shows a queue predefined in the <literal>hornetq-jms.xml</literal>
configuration file.</para>
<programlisting>
Expand Down
2 changes: 1 addition & 1 deletion docs/user-manual/en/using-jms.xml
Expand Up @@ -214,7 +214,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces</programlisting
<title>The code</title>
<para>Here's the code for the example:</para>
<para>First we'll create a JNDI initial context from which to lookup our JMS objects:</para>
<programlisting>InitialContect ic = new InitialContext();</programlisting>
<programlisting>InitialContext ic = new InitialContext();</programlisting>
<para>Now we'll look up the connection factory:</para>
<programlisting>ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");</programlisting>
<para>And look up the Queue:</para>
Expand Down
4 changes: 2 additions & 2 deletions docs/user-manual/en/using-server.xml
Expand Up @@ -264,7 +264,7 @@
&lt;/deployment></programlisting>
</para>
<para>We can see that, as well as the core HornetQ server, the stand-alone server
instantiates various different POJOs, lets look at them in turn:</para>
instantiates various different POJOs, let's look at them in turn:</para>
<itemizedlist>
<listitem>
<para>MBeanServer</para>
Expand Down Expand Up @@ -331,7 +331,7 @@

&lt;mbean code="org.hornetq.service.HornetQStarterService"
name="org.hornetq:service=HornetQStarterService">
&lt;!--lets let the JMS Server start us-->
&lt;!--let's let the JMS Server start us-->
&lt;attribute name="Start">false&lt;/attribute>

&lt;depends optional-attribute-name="SecurityManagerService"
Expand Down
2 changes: 1 addition & 1 deletion docs/user-manual/zh/using-jms.xml
Expand Up @@ -185,7 +185,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
<title>程序代码</title>
<para>下面给出的例子中的代码:</para>
<para>首先我们创建一个JNDI的Initial Context:</para>
<programlisting>InitialContect ic = new InitialContext();</programlisting>
<programlisting>InitialContext ic = new InitialContext();</programlisting>
<para>下面我们查找 connection factory:</para>
<programlisting>ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");</programlisting>
<para>然后查找 Queue:</para>
Expand Down
2 changes: 1 addition & 1 deletion docs/user-manual/zh/using-server.xml
Expand Up @@ -257,7 +257,7 @@

&lt;mbean code="org.hornetq.service.HornetQStarterService"
name="org.hornetq:service=HornetQStarterService"&gt;
&lt;!--lets let the JMS Server start us--&gt;
&lt;!--let's let the JMS Server start us--&gt;
&lt;attribute name="Start"&gt;false&lt;/attribute&gt;

&lt;depends optional-attribute-name="SecurityManagerService"
Expand Down
4 changes: 2 additions & 2 deletions examples/javaee/mdb-bmt/readme.html
Expand Up @@ -75,7 +75,7 @@ <h2>Example step-by-step</h2>
System.out.println("message " + text + " received");
</pre>

<li>Now we can do something within a user transaction, lets just start and commit it
<li>Now we can do something within a user transaction, let's just start and commit it
</li>
<pre class="prettyprint">
UserTransaction tx = ctx.getUserTransaction();
Expand Down Expand Up @@ -108,4 +108,4 @@ <h2>Example step-by-step</h2>

</ol>
</body>
</html>
</html>
Expand Up @@ -47,7 +47,7 @@ public void onMessage(final Message message)

System.out.println("message " + text + " received");

// Step 11. lets look at the user transaction to make sure there isn't one.
// Step 11. let's look at the user transaction to make sure there isn't one.
UserTransaction tx = ctx.getUserTransaction();

if (tx != null)
Expand All @@ -66,4 +66,4 @@ public void onMessage(final Message message)
e.printStackTrace();
}
}
}
}
6 changes: 3 additions & 3 deletions examples/javaee/mdb-cmt-tx-local/readme.html
Expand Up @@ -85,8 +85,8 @@ <h2>Example step-by-step</h2>
}
else
{
System.out.println("there is no global transaction, altho the messge delivery is using a local transaction");
System.out.println("lets throw an exception and see what happens");
System.out.println("there is no global transaction, although the message delivery is using a local transaction");
System.out.println("let's throw an exception and see what happens");
throw new RuntimeException("DOH!");
}
}
Expand Down Expand Up @@ -118,4 +118,4 @@ <h2>Example step-by-step</h2>

</ol>
</body>
</html>
</html>
Expand Up @@ -66,8 +66,8 @@ public void onMessage(final Message message)
}
else
{
System.out.println("there is no global transaction, altho the messge delivery is using a local transaction");
System.out.println("lets throw an exception and see what happens");
System.out.println("there is no global transaction, although the message delivery is using a local transaction");
System.out.println("let's throw an exception and see what happens");
throw new RuntimeException("DOH!");
}
}
Expand All @@ -87,4 +87,4 @@ public void onMessage(final Message message)
e.printStackTrace();
}
}
}
}
Expand Up @@ -53,7 +53,7 @@ public void onMessage(final Message message)

System.out.println("message " + text + " received");

// Step 11. lets look at the transaction to make sure there isn't one.
// Step 11. let's look at the transaction to make sure there isn't one.
Transaction tx = tm.getTransaction();

if (tx == null)
Expand All @@ -70,4 +70,4 @@ public void onMessage(final Message message)
e.printStackTrace();
}
}
}
}
2 changes: 1 addition & 1 deletion examples/javaee/xarecovery/server/jbossts-properties.xml
Expand Up @@ -15,7 +15,7 @@
in which case the token values are substituted for the values of the corresponding system
properties as follows:
- Any occurance of ${p} with the System.getProperty(p) value.
- Any occurrence of ${p} with the System.getProperty(p) value.
If there is no such property p defined, then the ${p} reference will remain unchanged.
- If the property reference is of the form ${p:v} and there is no such property p,
Expand Down
4 changes: 2 additions & 2 deletions examples/jms/jms-auto-closeable/readme.html
Expand Up @@ -30,7 +30,7 @@ <h2>Example step-by-step</h2>
<code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code>
</pre>

<li>We create a JMS context but we do it inside the try-with-resources statment like so:</li>
<li>We create a JMS context but we do it inside the try-with-resources statement like so:</li>
<pre class="prettyprint">
<code>
try
Expand Down Expand Up @@ -73,4 +73,4 @@ <h2>Example step-by-step</h2>

</ol>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions examples/jms/message-counters/readme.html
Expand Up @@ -81,7 +81,7 @@ <h2>Example step-by-step</h2>
false);</code>
</pre>

<li>We retrieve the message counter and display them. MessageCounters are retrieved as <code>JSON Strings</code> for portability reason (wether
<li>We retrieve the message counter and display them. MessageCounters are retrieved as <code>JSON Strings</code> for portability reason (whether
JMX is used for management or JMS messages). To make it simpler to use them in the code, there is a <code>MessageCounterInfo</code> data structure.</li>
<pre class="prettyprint">
<code>String counters = queueControl.listMessageCounter();
Expand Down Expand Up @@ -174,4 +174,4 @@ <h2>Example step-by-step</h2>
<li><a href="../../../docs/api/org/jboss/messaging/core/management/MessageCounterInfo.html">MessageCounterInfo</a> is a helper class used
to create a MessageCounterInfo object from the JSON String which represents message counters</li>
</body>
</html>
</html>
Expand Up @@ -58,7 +58,7 @@ public boolean runExample() throws Exception
// Step 3. Create a JMS Connection
connection = connectionFactory.createConnection();

// Step 4. Create a *non-transacted* JMS Session with client acknwoledgement
// Step 4. Create a *non-transacted* JMS Session with client acknowledgement
Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);

// Step 5. Start the connection to ensure delivery occurs
Expand Down
Expand Up @@ -58,7 +58,7 @@ public boolean runExample() throws Exception
// Step 3. Create a JMS Connection
connection = connectionFactory.createConnection();

// Step 4. Create a *non-transacted* JMS Session with client acknwoledgement
// Step 4. Create a *non-transacted* JMS Session with client acknowledgement
Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);

// Step 5. Start the connection to ensure delivery occurs
Expand Down

0 comments on commit b358eec

Please sign in to comment.