From bf6471e76b8eea44fb25107cede9de897324e462 Mon Sep 17 00:00:00 2001
From: Matt Tucker <matt@jivesoftware.com>
Date: Sun, 4 Feb 2007 06:17:15 +0000
Subject: [PATCH] Fixes

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6945 b35dd754-fafc-0310-a699-88a17e54d16e
---
 build/build.xml                                   |  2 +-
 build/release.xml                                 | 12 ++++++------
 source/org/jivesoftware/smack/RosterEntry.java    |  2 +-
 source/org/jivesoftware/smack/XMPPConnection.java |  4 ----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index f625c1e4e..34cd3b048 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -278,7 +278,7 @@
 
     <!-- release -->
     <!-- ======================================================================================= -->
-    <target name="release" if="release.exists" depends="release-exists">
+    <target name="release" description="Builds a release" if="release.exists" depends="release-exists">
         <antcall target="jar">
             <param name="no.test" value="true" />
         </antcall>
diff --git a/build/release.xml b/build/release.xml
index b118ea097..319da2809 100644
--- a/build/release.xml
+++ b/build/release.xml
@@ -112,31 +112,31 @@
         <if>
             <equals arg1="${dailybuild}" arg2="true" />
             <then>
-                <zip destfile="${basedir}/release/${release-dev.name}.zip"
+                <zip destfile="${basedir}/target/release/${release-dev.name}.zip"
                     basedir="${release-dev.dir}/.."
                     includes="${release-dev.name}/**/*.*"
                 />
-                <tar destfile="${basedir}/release/${release-dev.name}.tar.gz"
+                <tar destfile="${basedir}/target/release/${release-dev.name}.tar.gz"
                     basedir="${release-dev.dir}/.."
                     includes="${release-dev.name}/**/*.*"
                     compression="gzip"
                 />
             </then>
             <else>
-                <zip destfile="${basedir}/release/${release.name}.zip"
+                <zip destfile="${basedir}/target/release/${release.name}.zip"
                     basedir="${release.dir}/.."
                     includes="${release.name}/**/*.*"
                 />
-                <tar destfile="${basedir}/release/${release.name}.tar.gz"
+                <tar destfile="${basedir}/target/release/${release.name}.tar.gz"
                     basedir="${release.dir}/.."
                     includes="${release.name}/**/*.*"
                     compression="gzip"
                 />
-                <zip destfile="${basedir}/release/${release-dev.name}.zip"
+                <zip destfile="${basedir}/target/release/${release-dev.name}.zip"
                     basedir="${release-dev.dir}/.."
                     includes="${release-dev.name}/**/*.*"
                 />
-                <tar destfile="${basedir}/release/${release-dev.name}.tar.gz"
+                <tar destfile="${basedir}/target/release/${release-dev.name}.tar.gz"
                     basedir="${release-dev.dir}/.."
                     includes="${release-dev.name}/**/*.*"
                     compression="gzip"
diff --git a/source/org/jivesoftware/smack/RosterEntry.java b/source/org/jivesoftware/smack/RosterEntry.java
index e2933e42f..1d8bce1ee 100644
--- a/source/org/jivesoftware/smack/RosterEntry.java
+++ b/source/org/jivesoftware/smack/RosterEntry.java
@@ -124,7 +124,7 @@ public class RosterEntry {
 
     /**
      * Returns the roster subscription type of the entry. When the type is
-     * {@link RosterPacket.ItemType#none} or {@link RosterPacket.ItemType#from},
+     * RosterPacket.ItemType.none or RosterPacket.ItemType.from,
      * refer to {@link RosterEntry getStatus()} to see if a subscription request
      * is pending.
      *
diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java
index 523723b72..ef2b81176 100644
--- a/source/org/jivesoftware/smack/XMPPConnection.java
+++ b/source/org/jivesoftware/smack/XMPPConnection.java
@@ -588,10 +588,6 @@ public class XMPPConnection {
      * Closes the connection by setting presence to unavailable then closing the stream to
      * the XMPP server. The XMPPConnection can still be used for connecting to the server
      * again.
-     *
-     * The difference between disconnect and shutdown is that disconnect makes a complete reset
-     * of the connection state whereas shutdown only cleans the connection and keeps alive
-     * packet reader listeners, previous login and roster presences.
      */
     public void disconnect() {
         this.shutdown();