From 4477561d4b0e59c7479eeae87e103cfcb5407342 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Sat, 5 Jul 2014 12:04:40 +0200
Subject: [PATCH] Replace references to 'smack.jar'

Also don't mention the required JDK version in the README as such information
tends to become wrong easily.
---
 documentation/debugging.html                                | 6 +++---
 resources/README.html                                       | 4 ++--
 .../java/org/jivesoftware/smack/SmackConfiguration.java     | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/documentation/debugging.html b/documentation/debugging.html
index 59e7d1cb2..b5f891a6d 100644
--- a/documentation/debugging.html
+++ b/documentation/debugging.html
@@ -16,8 +16,8 @@ Debugging with Smack
 
 <p>
 Smack includes two built-in debugging consoles that will let you track all XML traffic between 
-the client and server. A <a href="#lite">lite debugger</a> which is part of the <tt>smack.jar</tt> 
-and an <a href="#enhanced">enhanced debugger</a> contained in <tt>smackx-debug.jar</tt>.
+the client and server. A <a href="#lite">lite debugger</a> which is part of the <tt>smack-core.jar</tt> 
+and an <a href="#enhanced">enhanced debugger</a> contained in <tt>smack-debug.jar</tt>.
 </p>
 
 <p>
@@ -56,7 +56,7 @@ Smack uses the following logic to decide the debugger console to use:
 	<li>If step 1 fails then Smack will try to use the enhanced debugger. The
 	file <tt>smackx-debug.jar</tt> contains the enhanced debugger. Therefore you will need
 	to place the jar file in the classpath. For situations where space is an issue you
-	may want to only deploy <tt>smack.jar</tt> in which case the enhanced debugger won't be
+	may want to only deploy <tt>smack-core.jar</tt> in which case the enhanced debugger won't be
 	available.<p> 
 
 	<li>The last option if the previous two steps fail is to use the lite debugger. The lite 
diff --git a/resources/README.html b/resources/README.html
index bd1895657..7d6e349e1 100644
--- a/resources/README.html
+++ b/resources/README.html
@@ -55,9 +55,9 @@ possible, instructions are provided for both Unix/Linux and Windows users.
 <p>
 <b><a name="javaSetup">Configure Java</a></b>
 <ul>
-	Java 6 (JDK 1.6 or later) must be installed and setup on your machine. To test the installation,
+	A Java Development Kit (JDK) must be installed and setup on your machine. To test the installation,
 	open a shell in a Unix or a MS-DOS prompt in Windows. Check your version of
-	Java with "java -version".
+	Java with "javac -version".
 	If Java isn't installed, download a copy from the 
 	<a href="http://java.oracle.com/">Java website</a>.
 </ul>
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
index 2b51cd69e..374c1c8b5 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
@@ -52,8 +52,7 @@ import org.xmlpull.v1.XmlPullParserException;
  *          via the API will override settings in the configuration file.
  * </ul>
  *
- * Configuration settings are stored in org.jivesoftware.smack/smack-config.xml (typically inside the
- * smack.jar file).
+ * Configuration settings are stored in org.jivesoftware.smack/smack-config.xml.
  * 
  * @author Gaston Dombiak
  */