Merge branch '4.2'

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

@@ -68,7 +68,6 @@ public final class SmackConfiguration {
      * <li> Server Traffic -- raw XML traffic sent by the server to the client.
      * <li> Interpreted Packets -- shows XML packets from the server as parsed by Smack.
      * </ul>
-     * <p/>
      * Debugging can be enabled by setting this field to true, or by setting the Java system
      * property <tt>smack.debugEnabled</tt> to true. The system property can be set on the
      * command line such as "java SomeApp -Dsmack.debugEnabled=true".

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

@@ -34,7 +34,6 @@ import org.jxmpp.jid.EntityFullJid;
  * implements shared methods which are used by the different types of connections (e.g.
  * <code>XMPPTCPConnection</code> or <code>XMPPBOSHConnection</code>). To create a connection to an XMPP server
  * a simple usage of this API might look like the following:
- * <p>
  * 
  * <pre>
  * // Create a connection to the igniterealtime.org XMPP server.
@@ -54,7 +53,6 @@ import org.jxmpp.jid.EntityFullJid;
  * // Disconnect from the server
  * con.disconnect();
  * </pre>
- * </p>
  * <p>
  * Note that the XMPPConnection interface does intentionally not declare any methods that manipulate
  * the connection state, e.g. <code>connect()</code>, <code>disconnect()</code>. You should use the

smack-core/src/main/java/org/jivesoftware/smack/compression/Java7ZlibInputOutputStream.java

@@ -34,8 +34,8 @@ import java.util.zip.InflaterInputStream;
  * <p>
  * See also:
  * <ul>
- * <li><a href="http://docs.oracle.com/javase/7/docs/api/java/util/zip/Deflater.html#deflate(byte[], int, int, int)">The required deflate() method (Java7)</a>
- * <li><a href="http://developer.android.com/reference/java/util/zip/Deflater.html#deflate(byte[], int, int, int)">The required deflate() method (Android)</a>
+  * <li><a href="http://docs.oracle.com/javase/7/docs/api/java/util/zip/Deflater.html#deflate(byte[],%20int,%20int,%20int)">The required deflate() method (Java7)</a>
+ * <li><a href="http://developer.android.com/reference/java/util/zip/Deflater.html#deflate(byte[],%20int,%20int,%20int)">The required deflate() method (Android)</a>
  * </ul>
  * 
  * @author Florian Schmaus

smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java

@@ -26,11 +26,12 @@ import org.jivesoftware.smack.XMPPConnection;
 /**
  * Very simple debugger that prints to the console (stdout) the sent and received stanzas. Use
  * this debugger with caution since printing to the console is an expensive operation that may
- * even block the thread since only one thread may print at a time.<p>
- * <p/>
+ * even block the thread since only one thread may print at a time.
+ * <p>
  * It is possible to not only print the raw sent and received stanzas but also the interpreted
  * packets by Smack. By default interpreted packets won't be printed. To enable this feature
  * just change the <tt>printInterpreted</tt> static variable to <tt>true</tt>.
+ * </p>
  *
  * @author Gaston Dombiak
  */

smack-core/src/main/java/org/jivesoftware/smack/debugger/JulDebugger.java

@@ -24,11 +24,12 @@ import org.jivesoftware.smack.XMPPConnection;
 /**
  * Very simple debugger that prints to the console (stdout) the sent and received stanzas. Use
  * this debugger with caution since printing to the console is an expensive operation that may
- * even block the thread since only one thread may print at a time.<p>
- * <p/>
+ * even block the thread since only one thread may print at a time.
+ * <p>
  * It is possible to not only print the raw sent and received stanzas but also the interpreted
  * packets by Smack. By default interpreted packets won't be printed. To enable this feature
  * just change the <tt>printInterpreted</tt> static variable to <tt>true</tt>.
+ * </p>
  *
  * @author Gaston Dombiak
  */

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

@@ -25,7 +25,7 @@ public class ErrorIQ extends SimpleIQ {
     /**
      * Constructs a new error IQ.
      * <p>
-     * According to RFC 6120 § 8.3.1 "4. An error stanza MUST contain an <error/> child element.", so the xmppError argument is mandatory.
+     * According to RFC 6120 § 8.3.1 "4. An error stanza MUST contain an &lt;error/&gt; child element.", so the xmppError argument is mandatory.
      * </p>
      * @param xmppErrorBuilder the XMPPError builder (required).
      */

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

@@ -135,7 +135,7 @@ public interface Packet extends TopLevelStreamElement {
     List<ExtensionElement> getExtensions();
 
     /**
-     * Return a set of all extensions with the given element name <emph>and</emph> namespace.
+     * Return a set of all extensions with the given element name <i>and</i> namespace.
      * <p>
      * Changes to the returned set will update the stanza(/packet) extensions, if the returned set is not the empty set.
      * </p>

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

@@ -70,7 +70,7 @@ public abstract class Stanza implements TopLevelStreamElement {
      * Such an attribute is defined for all stanza types. For IQ, see for
      * example XEP-50 3.7:
      * "The requester SHOULD provide its locale information using the "xml:lang
-     * " attribute on either the <iq/> (RECOMMENDED) or <command/> element."
+     * " attribute on either the &lt;iq/&gt; (RECOMMENDED) or &lt;command/&gt; element."
      * </p>
      */
     protected String language;

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

@@ -33,7 +33,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
  *
  * <table border=1>
  *      <caption>XMPP Errors</caption>
- *      <hr><td><b>XMPP Error Condition</b></td><td><b>Type</b></td><td><b>RFC 6120 Section</b></td></hr>
+ *      <tr><th>XMPP Error Condition</th><th>Type</th><th>RFC 6120 Section</th></tr>
  *      <tr><td>bad-request</td><td>MODIFY</td><td>8.3.3.1</td></tr>
  *      <tr><td>conflict</td><td>CANCEL</td><td>8.3.3.2</td></tr>
  *      <tr><td>feature-not-implemented</td><td>CANCEL</td><td>8.3.3.3</td></tr>

smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java

@@ -35,6 +35,7 @@ import org.jxmpp.jid.EntityBareJid;
 /**
  * Base class for SASL mechanisms.
  * Subclasses will likely want to implement their own versions of these methods:
+ * <ul>
  *  <li>{@link #authenticate(String, String, DomainBareJid, String, EntityBareJid, SSLSession)} -- Initiate authentication stanza using the
  *  deprecated method.</li>
  *  <li>{@link #authenticate(String, DomainBareJid, CallbackHandler, EntityBareJid, SSLSession)} -- Initiate authentication stanza