diff --git a/source/org/jivesoftware/smack/RosterEntry.java b/source/org/jivesoftware/smack/RosterEntry.java
index 4b81a64ae..d61ad3814 100644
--- a/source/org/jivesoftware/smack/RosterEntry.java
+++ b/source/org/jivesoftware/smack/RosterEntry.java
@@ -125,7 +125,9 @@ public class RosterEntry {
 
     /**
      * Returns the roster subscription type of the entry. When the type is
-     * RosterPacket.ItemType.NONE, the subscription request is pending.
+     * {@link RosterPacket.ItemType#NONE} or {@link RosterPacket.ItemType#FROM},
+     * refer to {@link RosterEntry getStatus()} to see if a subscription request
+     * is pending.
      *
      * @return the type.
      */
@@ -135,8 +137,8 @@ public class RosterEntry {
 
     /**
      * Returns the roster subscription status of the entry. When the status is
-     * RosterPacket.ItemStatus.SUBSCRIPTION_PENDING, the contact has to answer the subscription
-     * request.
+     * RosterPacket.ItemStatus.SUBSCRIPTION_PENDING, the contact has to answer the
+     * subscription request.
      *
      * @return the status.
      */
diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java
index ec29f30bf..cb5ac4977 100644
--- a/source/org/jivesoftware/smack/XMPPConnection.java
+++ b/source/org/jivesoftware/smack/XMPPConnection.java
@@ -168,9 +168,8 @@ public class XMPPConnection {
     }
 
     /**
-     * Creates a new connection to the specified XMPP server on the given port. The IP address
-     * of the server is assumed to match the service name.
-     *
+     * Creates a new connection to the XMPP server at the specifiec host and port.
+     * 
      * @param host the name of the XMPP server to connect to; e.g. <tt>jivesoftware.com</tt>.
      * @param port the port on the server that should be used; e.g. <tt>5222</tt>.
      * @throws XMPPException if an error occurs while trying to establish the connection.