s/ a XMPP/ an XMPP/

documentation/extensions/caps.md

@@ -8,7 +8,7 @@ Capabilities.
 
 **Description**
 
-Entity Capabilities is a XMPP Protocol extension, which, in order to minimize
+Entity Capabilities is an XMPP Protocol extension, which, in order to minimize
 network impact, caches the capabilities of XMPP entities. Those capabilities
 are determined with the help of the Service Discovery Protocol
 ([XEP-0030](http://xmpp.org/extensions/xep-0030.html)).

documentation/extensions/index.md

@@ -51,7 +51,7 @@ Smack Extensions and currently supported XEPs by Smack (smack-extensions)
 | Data Forms Validation                       | [XEP-0122](http://xmpp.org/extensions/xep-0122.html) | Enables an application to specify additional validation guidelines . |
 | Stream Compression                          | [XEP-0138](http://xmpp.org/extensions/xep-0138.html) | Support for optional compression of the XMPP stream.
 | Data Forms Layout                           | [XEP-0141](http://xmpp.org/extensions/xep-0141.html) | Enables an application to specify form layouts. |
-| Personal Eventing Protocol                  | [XEP-0163](http://xmpp.org/extensions/xep-0163.html) | Using the XMPP publish-subscribe protocol to broadcast state change events associated with a XMPP account. |
+| Personal Eventing Protocol                  | [XEP-0163](http://xmpp.org/extensions/xep-0163.html) | Using the XMPP publish-subscribe protocol to broadcast state change events associated with an XMPP account. |
 | Message Delivery Receipts                   | [XEP-0184](http://xmpp.org/extensions/xep-0184.html) | Extension for message delivery receipts. The sender can request notification that the message has been delivered. |
 | XMPP Ping                                   | [XEP-0199](http://xmpp.org/extensions/xep-0199.html) | Sending application-level pings over XML streams.
 | Entity Time                                 | [XEP-0202](http://xmpp.org/extensions/xep-0202.html) | Allows entities to communicate their local time |

documentation/extensions/muc.md

@@ -69,7 +69,7 @@ completed with default values:
 // Get the MultiUserChatManager
 MultiUserChatManager manager = MultiUserChatManager.getInstanceFor(connection);
 
-// Create a MultiUserChat using a XMPPConnection for a room
+// Create a MultiUserChat using an XMPPConnection for a room
 MultiUserChat muc = = manager.getMultiUserChat("myroom@conference.jabber.org");
 
 // Create the room
@@ -132,7 +132,7 @@ In this example we can see how to join a room with a given nickname:
 // Get the MultiUserChatManager
 MultiUserChatManager manager = MultiUserChatManager.getInstanceFor(connection);
 
-// Create a MultiUserChat using a XMPPConnection for a room
+// Create a MultiUserChat using an XMPPConnection for a room
 MultiUserChat muc2 = manager.getMultiUserChat("myroom@conference.jabber.org");
 
 // User2 joins the new room
@@ -147,7 +147,7 @@ password:
 // Get the MultiUserChatManager
 MultiUserChatManager manager = MultiUserChatManager.getInstanceFor(connection);
 
-// Create a MultiUserChat using a XMPPConnection for a room
+// Create a MultiUserChat using an XMPPConnection for a room
 MultiUserChat muc2 = manager.getMultiUserChat("myroom@conference.jabber.org");
 
 // User2 joins the new room using a password
@@ -162,7 +162,7 @@ the amount of history to receive:
 // Get the MultiUserChatManager
 MultiUserChatManager manager = MultiUserChatManager.getInstanceFor(connection);
 
-// Create a MultiUserChat using a XMPPConnection for a room
+// Create a MultiUserChat using an XMPPConnection for a room
 MultiUserChat muc2 = manager.getMultiUserChat("myroom@conference.jabber.org");
 
 // User2 joins the new room using a password and specifying
@@ -209,7 +209,7 @@ for possible rejections:
 // Get the MultiUserChatManager
 MultiUserChatManager manager = MultiUserChatManager.getInstanceFor(connection);
 
-// Create a MultiUserChat using a XMPPConnection for a room
+// Create a MultiUserChat using an XMPPConnection for a room
 MultiUserChat muc2 = manager.getMultiUserChat("myroom@conference.jabber.org");
 
 muc2.join("testbot2");

documentation/gettingstarted.md

@@ -97,7 +97,7 @@ your presence to let people know you're unavailable and "out fishing":
 // Create a new presence. Pass in false to indicate we're unavailable._
 Presence presence = new Presence(Presence.Type.unavailable);
 presence.setStatus("Gone fishing");
-// Send the packet (assume we have a XMPPConnection instance called "con").
+// Send the packet (assume we have an XMPPConnection instance called "con").
 con.sendPacket(presence);
 ```
 

documentation/messaging.md

@@ -16,7 +16,7 @@ The following code snippet demonstrates how to create a new Chat with a user
 and then send them a text message:
 
 ```
-// Assume we've created a XMPPConnection name "connection"._
+// Assume we've created an XMPPConnection name "connection"._
 ChatManager chatmanager = connection.getChatManager();
 Chat newChat = chatmanager.createChat("jsmith@jivesoftware.com", new MessageListener() {
 	public void processMessage(Chat chat, Message message) {
@@ -72,7 +72,7 @@ when it happens. You can register a message listener to receive all future
 messages as part of this handler.
 
 ```
-_// Assume we've created a XMPPConnection name "connection"._
+_// Assume we've created an XMPPConnection name "connection"._
 ChatManager chatmanager = connection.getChatManager().addChatListener(
 	new ChatManagerListener() {
 		@Override

documentation/processing.md

@@ -22,7 +22,7 @@ and a packet listener:
 // user. We use an AndFilter to combine two other filters._
 PacketFilter filter = new AndFilter(new PacketTypeFilter(Message.class),
 		new FromContainsFilter("mary@jivesoftware.com"));
-// Assume we've created a XMPPConnection name "connection".
+// Assume we've created an XMPPConnection name "connection".
 
 // First, register a packet collector using the filter we created.
 PacketCollector myCollector = connection.createPacketCollector(filter);

smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java

@@ -58,7 +58,7 @@ import org.igniterealtime.jbosh.BodyQName;
 import org.igniterealtime.jbosh.ComposableBody;
 
 /**
- * Creates a connection to a XMPP server via HTTP binding.
+ * Creates a connection to an XMPP server via HTTP binding.
  * This is specified in the XEP-0206: XMPP Over BOSH.
  * 
  * @see XMPPConnection
@@ -101,7 +101,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
     protected String sessionID = null;
 
     /**
-     * Create a HTTP Binding connection to a XMPP server.
+     * Create a HTTP Binding connection to an XMPP server.
      * 
      * @param username the username to use.
      * @param password the password to use.
@@ -123,7 +123,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
     }
 
     /**
-     * Create a HTTP Binding connection to a XMPP server.
+     * Create a HTTP Binding connection to an XMPP server.
      * 
      * @param config The configuration which is used for this connection.
      */

smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java

@@ -327,7 +327,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
     private final Map<String, IQRequestHandler> getIqRequestHandler = new HashMap<>();
 
     /**
-     * Create a new XMPPConnection to a XMPP server.
+     * Create a new XMPPConnection to an XMPP server.
      * 
      * @param configuration The configuration which is used to establish the connection.
      */

smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java

@@ -28,9 +28,9 @@ import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.packet.PlainStreamElement;
 
 /**
- * The XMPPConnection interface provides an interface for connections to a XMPP server and
+ * The XMPPConnection interface provides an interface for connections to an XMPP server and
  * implements shared methods which are used by the different types of connections (e.g.
- * {@link XMPPTCPConnection} or {@link XMPPBOSHConnection}). To create a connection to a XMPP server
+ * {@link XMPPTCPConnection} or {@link XMPPBOSHConnection}). To create a connection to an XMPP server
  * a simple usage of this API might look like the following:
  * <p>
  * 
@@ -107,7 +107,7 @@ public interface XMPPConnection {
 
     /**
      * Returns the stream ID for this connection, which is the value set by the server
-     * when opening a XMPP stream. This value will be <tt>null</tt> if not connected to the server.
+     * when opening an XMPP stream. This value will be <tt>null</tt> if not connected to the server.
      * 
      * @return the ID of this connection returned from the XMPP server or <tt>null</tt> if
      *      not connected to the server.

smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java

@@ -26,7 +26,7 @@ import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
 /**
- * Represents a XMPP error sub-packet. Typically, a server responds to a request that has
+ * Represents an XMPP error sub-packet. Typically, a server responds to a request that has
  * problems by sending the packet back and including an error packet. Each error has a type,
  * error condition as well as as an optional text explanation. Typical errors are:<p>
  *

smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventManagerTest.java

@@ -37,7 +37,7 @@ public class MessageEventManagerTest extends SmackTestCase {
 
     /**
      * High level API test.
-     * This is a simple test to use with a XMPP client and check if the client receives the 
+     * This is a simple test to use with an XMPP client and check if the client receives the 
      * message
      * 1. User_1 will send a message to user_2 requesting to be notified when any of these events
      * occurs: offline, composing, displayed or delivered 
@@ -64,11 +64,11 @@ public class MessageEventManagerTest extends SmackTestCase {
 
     /**
      * High level API test.
-     * This is a simple test to use with a XMPP client, check if the client receives the 
+     * This is a simple test to use with an XMPP client, check if the client receives the 
      * message and display in the console any notification
      * 1. User_1 will send a message to user_2 requesting to be notified when any of these events
      * occurs: offline, composing, displayed or delivered 
-     * 2. User_2 will use a XMPP client (like Exodus) to display the message and compose a reply
+     * 2. User_2 will use an XMPP client (like Exodus) to display the message and compose a reply
      * 3. User_1 will display any notification that receives
      */
     public void testSendMessageEventRequestAndDisplayNotifications() {

smack-extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeManagerTest.java

@@ -43,7 +43,7 @@ public class RosterExchangeManagerTest extends SmackTestCase {
 
     /**
      * High level API test.
-     * This is a simple test to use with a XMPP client and check if the client receives user1's 
+     * This is a simple test to use with an XMPP client and check if the client receives user1's 
      * roster
      * 1. User_1 will send his/her roster to user_2
      */
@@ -62,7 +62,7 @@ public class RosterExchangeManagerTest extends SmackTestCase {
 
     /**
      * High level API test.
-     * This is a simple test to use with a XMPP client and check if the client receives user1's 
+     * This is a simple test to use with an XMPP client and check if the client receives user1's 
      * roster groups
      * 1. User_1 will send his/her RosterGroups to user_2
      */

smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java

@@ -44,7 +44,7 @@ public class XHTMLManagerTest extends SmackTestCase {
 
     /**
      * High level API test.
-     * This is a simple test to use with a XMPP client and check if the client receives the message
+     * This is a simple test to use with an XMPP client and check if the client receives the message
      * 1. User_1 will send a message with formatted text (XHTML) to user_2
      */
     public void testSendSimpleXHTMLMessage() {

smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java

@@ -36,7 +36,7 @@ public class MessageEventTest extends SmackTestCase {
 
     /**
      * Low level API test.
-     * This is a simple test to use with a XMPP client and check if the client receives the 
+     * This is a simple test to use with an XMPP client and check if the client receives the 
      * message
      * 1. User_1 will send a message to user_2 requesting to be notified when any of these events
      * occurs: offline, composing, displayed or delivered 
@@ -70,11 +70,11 @@ public class MessageEventTest extends SmackTestCase {
 
     /**
      * Low level API test.
-     * This is a simple test to use with a XMPP client, check if the client receives the 
+     * This is a simple test to use with an XMPP client, check if the client receives the 
      * message and display in the console any notification
      * 1. User_1 will send a message to user_2 requesting to be notified when any of these events
      * occurs: offline, composing, displayed or delivered 
-     * 2. User_2 will use a XMPP client (like Exodus) to display the message and compose a reply
+     * 2. User_2 will use an XMPP client (like Exodus) to display the message and compose a reply
      * 3. User_1 will display any notification that receives
      */
     public void testSendMessageEventRequestAndDisplayNotifications() {

smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java

@@ -38,7 +38,7 @@ public class RosterExchangeTest extends SmackTestCase {
 
     /**
      * Low level API test.
-     * This is a simple test to use with a XMPP client and check if the client receives the message
+     * This is a simple test to use with an XMPP client and check if the client receives the message
      * 1. User_1 will send his/her roster entries to user_2
      */
     public void testSendRosterEntries() {

smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java

@@ -45,7 +45,7 @@ public class XHTMLExtensionTest extends SmackTestCase {
 
     /**
      * Low level API test.
-     * This is a simple test to use with a XMPP client and check if the client receives the message
+     * This is a simple test to use with an XMPP client and check if the client receives the message
      * 1. User_1 will send a message with formatted text (XHTML) to user_2
      */
     public void testSendSimpleXHTMLMessage() {

smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java

@@ -692,7 +692,7 @@ public final class Socks5BytestreamManager implements BytestreamManager {
     }
 
     /**
-     * Responses to the given packet's sender with a XMPP error that a SOCKS5 Bytestream is not
+     * Responses to the given packet's sender with an XMPP error that a SOCKS5 Bytestream is not
      * accepted.
      * <p>
      * Specified in XEP-65 5.3.1 (Example 13)

smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java

@@ -99,7 +99,7 @@ class Socks5ClientForInitiator extends Socks5Client {
     }
 
     /**
-     * Activates the SOCKS5 Bytestream by sending a XMPP SOCKS5 Bytestream activation packet to the
+     * Activates the SOCKS5 Bytestream by sending an XMPP SOCKS5 Bytestream activation packet to the
      * SOCKS5 proxy.
      * @throws XMPPErrorException 
      * @throws NoResponseException 

smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java

@@ -53,7 +53,7 @@ import org.jivesoftware.smackx.xdata.Form;
  * An AdHocCommandManager is responsible for keeping the list of available
  * commands offered by a service and for processing commands requests.
  *
- * Pass in a XMPPConnection instance to
+ * Pass in an XMPPConnection instance to
  * {@link #getAddHocCommandsManager(org.jivesoftware.smack.XMPPConnection)} in order to
  * get an instance of this class. 
  * 
@@ -70,7 +70,7 @@ public class AdHocCommandManager extends Manager {
     private static final int SESSION_TIMEOUT = 2 * 60;
 
     /**
-     * Map a XMPPConnection with it AdHocCommandManager. This map have a key-value
+     * Map an XMPPConnection with it AdHocCommandManager. This map have a key-value
      * pair for every active connection.
      */
     private static Map<XMPPConnection, AdHocCommandManager> instances = new WeakHashMap<>();

smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java

@@ -72,7 +72,7 @@ public class AccountManager extends Manager {
     /**
      * Creates a new AccountManager instance.
      *
-     * @param connection a connection to a XMPP server.
+     * @param connection a connection to an XMPP server.
      */
     private AccountManager(XMPPConnection connection) {
         super(connection);

smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java

@@ -70,7 +70,7 @@ public class PEPManager {
     /**
      * Creates a new PEP exchange manager.
      *
-     * @param connection a XMPPConnection which is used to send and receive messages.
+     * @param connection an XMPPConnection which is used to send and receive messages.
      */
     public PEPManager(XMPPConnection connection) {
         this.connection = connection;

smack-extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java

@@ -35,7 +35,7 @@ public class Ping extends SimpleIQ {
     }
 
     /**
-     * Create a XMPP Pong for this Ping
+     * Create an XMPP Pong for this Ping
      * 
      * @return the Pong
      */

smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java

@@ -37,7 +37,7 @@ import org.jivesoftware.smack.packet.Stanza;
 /**
  * This class can be used in conjunction with a mocked XMPP connection (
  * {@link ConnectionUtils#createMockedConnection(Protocol, String, String)}) to
- * verify a XMPP protocol. This can be accomplished in the following was:
+ * verify an XMPP protocol. This can be accomplished in the following was:
  * <ul>
  * <li>add responses to packets sent over the mocked XMPP connection by the
  * method to test in the order the tested method awaits them</li>

smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java

@@ -740,7 +740,7 @@ public class Roster extends Manager {
      * Returns a List of Presence objects for all of a user's current presences if no presence information is available,
      * such as when you are not subscribed to the user's presence updates.
      *
-     * @param bareJid a XMPP ID, e.g. jdoe@example.com.
+     * @param bareJid an XMPP ID, e.g. jdoe@example.com.
      * @return a List of Presence objects for all the user's current presences, or an unavailable presence if no
      *         presence information is available.
      */
@@ -782,7 +782,7 @@ public class Roster extends Manager {
      * information is available, such as when you are not subscribed to the user's presence
      * updates.
      *
-     * @param user a XMPP ID, e.g. jdoe@example.com.
+     * @param user an XMPP ID, e.g. jdoe@example.com.
      * @return a List of Presence objects for all the user's current presences,
      *         or an unavailable presence if the user is offline or if no presence information
      *         is available.

smack-jingle-old/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java

@@ -35,7 +35,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Jingle Demo Application. It register in a XMPP Server and let users place calls using a full JID and auto-receive calls.
+ * Jingle Demo Application. It register in an XMPP Server and let users place calls using a full JID and auto-receive calls.
  * Parameters: Server User Pass.
  */
 public class Demo extends JFrame {

smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java

@@ -186,7 +186,7 @@ public class JingleManagerTest extends SmackTestCase {
     }
 
     /**
-     * High level API test. This is a simple test to use with a XMPP client and
+     * High level API test. This is a simple test to use with an XMPP client and
      * check if the client receives the message 1. User_1 will send an
      * invitation to user_2.
      */
@@ -239,7 +239,7 @@ public class JingleManagerTest extends SmackTestCase {
     }
 
     /**
-     * High level API test. This is a simple test to use with a XMPP client and
+     * High level API test. This is a simple test to use with an XMPP client and
      * check if the client receives the message 1. User_1 will send an
      * invitation to user_2.
      */

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java

@@ -97,7 +97,7 @@ import org.jxmpp.util.XmppStringUtils;
  * <p/>
  *                               try {
  * <p/>
- *                                           // Connect to a XMPP Server
+ *                                           // Connect to an XMPP Server
  *                                           XMPPConnection x1 = new XMPPTCPConnection("xmpp.com");
  *                                           x1.connect();
  *                                           x1.login("juliet", "juliet");
@@ -140,7 +140,7 @@ import org.jxmpp.util.XmppStringUtils;
  * <p/>
  *                                     try {
  * <p/>
- *                                           // Connect to a XMPP Server
+ *                                           // Connect to an XMPP Server
  *                                           XMPPConnection x0 = new XMPPTCPConnection("xmpp.com");
  *                                           x0.connect();
  *                                           x0.login("romeo", "romeo");
@@ -250,7 +250,7 @@ public class JingleManager implements JingleSessionListener {
     /**
      * Setup the jingle system to let the remote clients know we support Jingle.
      * (This used to be a static part of construction.  The problem is a remote client might
-     * attempt a Jingle connection to us after we've created a XMPPConnection, but before we've
+     * attempt a Jingle connection to us after we've created an XMPPConnection, but before we've
      * setup an instance of a JingleManager.  We will appear to not support Jingle.  With the new
      * method you just call it once and all new connections will report Jingle support.)
      */

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java

@@ -48,7 +48,7 @@ public class BridgedResolver extends TransportResolver {
 
     /**
      * Constructor.
-     * A Bridged Resolver need a XMPPConnection to connect to a RTP Bridge.
+     * A Bridged Resolver need an XMPPConnection to connect to a RTP Bridge.
      */
     public BridgedResolver(XMPPConnection connection) {
         super();

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java

@@ -38,7 +38,7 @@ import de.javawi.jstun.util.UtilityException;
 /**
  * ICE Resolver for Jingle transport method that results in sending data between two entities using the Interactive Connectivity Establishment (ICE) methodology. (XEP-0176)
  * The goal of this resolver is to make possible to establish and manage out-of-band connections between two XMPP entities, even if they are behind Network Address Translators (NATs) or firewalls.
- * To use this resolver you must have a STUN Server and be in a non STUN blocked network. Or use a XMPP server with public IP detection Service.
+ * To use this resolver you must have a STUN Server and be in a non STUN blocked network. Or use an XMPP server with public IP detection Service.
  *
  * @author Thiago Camargo
  */

smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java

@@ -70,7 +70,7 @@ public class MessageEventManager extends Manager {
     /**
      * Creates a new message event manager.
      *
-     * @param con a XMPPConnection to a XMPP server.
+     * @param con an XMPPConnection to a XMPP server.
      */
     private MessageEventManager(XMPPConnection connection) {
         super(connection);

smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java

@@ -71,7 +71,7 @@ public class RosterExchangeManager {
     /**
      * Creates a new roster exchange manager.
      *
-     * @param connection a XMPPConnection which is used to send and receive messages.
+     * @param connection an XMPPConnection which is used to send and receive messages.
      */
     public RosterExchangeManager(XMPPConnection connection) {
         weakRefConnection = new WeakReference<XMPPConnection>(connection);

smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java

@@ -128,8 +128,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * Creates a socket connection to a XMPP server. This is the default connection
+ * Creates a socket connection to an XMPP server. This is the default connection
- * to a XMPP server and is specified in the XMPP Core (RFC 6120).
+ * to an XMPP server and is specified in the XMPP Core (RFC 6120).
  * 
  * @see XMPPConnection
  * @author Matt Tucker
@@ -602,7 +602,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
                 }
             }
         }
-        // Start the packet writer. This will open a XMPP stream to the server
+        // Start the packet writer. This will open an XMPP stream to the server
         packetWriter.init();
         // Start the packet reader. The startup() method will block until we
         // get an opening stream packet back from server