diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java
index 29d27c9a0..1adfefb23 100644
--- a/source/org/jivesoftware/smack/XMPPConnection.java
+++ b/source/org/jivesoftware/smack/XMPPConnection.java
@@ -273,7 +273,7 @@ public class XMPPConnection {
      * will be null. 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.
+     *      not connected to the server.
      */
     public String getConnectionID() {
         if (!isConnected()) {
@@ -342,7 +342,7 @@ public class XMPPConnection {
      * For more advanced login settings see {@link ConnectionConfiguration}.
      *
      * @param username the username.
-     * @param password     the password or <tt>null</tt> if using a CallbackHandler.
+     * @param password the password or <tt>null</tt> if using a CallbackHandler.
      * @throws XMPPException if an error occurs.
      */
     public void login(String username, String password) throws XMPPException {
@@ -370,12 +370,12 @@ public class XMPPConnection {
      * {@link ConnectionConfiguration#setCallbackHandler(javax.security.auth.callback.CallbackHandler)}.
      * For more advanced login settings see {@link ConnectionConfiguration}.
      *
-     * @param username     the username.
-     * @param password     the password or <tt>null</tt> if using a CallbackHandler.
-     * @param resource     the resource.
-     * @throws XMPPException         if an error occurs.
+     * @param username the username.
+     * @param password the password or <tt>null</tt> if using a CallbackHandler.
+     * @param resource the resource.
+     * @throws XMPPException if an error occurs.
      * @throws IllegalStateException if not connected to the server, or already logged in
-     *                               to the serrver.
+     *      to the serrver.
      */
     public synchronized void login(String username, String password, String resource) throws XMPPException {
         if (!isConnected()) {
@@ -457,9 +457,9 @@ public class XMPPConnection {
      * does succeed, your XMPP address will likely be in the form "server/123ABC" (where "123ABC"
      * is a random value generated by the server).
      *
-     * @throws XMPPException         if an error occurs or anonymous logins are not supported by the server.
+     * @throws XMPPException if an error occurs or anonymous logins are not supported by the server.
      * @throws IllegalStateException if not connected to the server, or already logged in
-     *                               to the serrver.
+     *      to the serrver.
      */
     public synchronized void loginAnonymously() throws XMPPException {
         if (!isConnected()) {
@@ -1405,10 +1405,10 @@ public class XMPPConnection {
      * occurs after an abrupt termination.
      *
      * @throws XMPPException if an error occurs while trying to establish the connection.
-     *                       Two possible errors can occur which will be wrapped by an XMPPException --
-     *                       UnknownHostException (XMPP error code 504), and IOException (XMPP error code
-     *                       502). The error codes and wrapped exceptions can be used to present more
-     *                       appropiate error messages to end-users.
+     *      Two possible errors can occur which will be wrapped by an XMPPException --
+     *      UnknownHostException (XMPP error code 504), and IOException (XMPP error code
+     *      502). The error codes and wrapped exceptions can be used to present more
+     *      appropiate error messages to end-users.
      */
     public void connect() throws XMPPException {
         // Stablishes the connection, readers and writers