Merge branch '4.4'

resources/javadoc-overview.html

@@ -14,15 +14,35 @@
 AbstractXMPPConnection connection = new XMPPTCPConnection("mtucker", "password", "jabber.org");
 connection.connect().login();
 
-Message message = new Message("jsmith@igniterealtime.org", "Howdy! How are you?");
+Message message = connection.getStanzaFactory()
+   .buildMessageStanza()
+   .to("jsmith@igniterealtime.org")
+   .setBody("Howdy! How are you?")
+   .build();
+
 connection.sendStanza(message);
+
+connection.disconnect();
   </pre>
 
   <p>Smack doesn't force you to code at the protcol level of XMPP. The library provides intelligent higher level constructs, often called {@link org.jivesoftware.smack.Manager}, which let you program more efficiently. Other examples of those constructs are the Chat and Roster classes.</p>
 
   <p>Smack comes with APIs for easy machine-to-machine communication. You can set any number of properties on each message, including properties that are Java objects.</p>
 
-  <p>Smack is open-source under the Apache License 2.0, which means you can incorporate Smack into your commercial or non-commercial applications.</p>
+  <h2>License</h2>
+
+  <p>Smack is open-source and most parts are under the Apache License
+  2.0, which means you can incorporate Smack into your commercial or
+  non-commercial applications. Some parts of Smack may be under a
+  different open-source license. Please refer to the individual
+  subprojects for their license statement.</p>
+
+  <p>Note that the Apache License 2.0 requires that the contents of a
+  NOICE text file are shown "…within a display generated by the
+  Derivative Works, if and wherever such third-party notices normally
+  appear.". Smack comes with such a NOTICE file. The content of
+  Smack's NOTICE file can conveniently be retrieved using
+  {@link org.jivesoftware.smack.Smack#getNoticeStream}.</p>
 
   <h2>About XMPP</h2>