Return-Path: 
 <dev-return-72942-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 50710 invoked from network); 5 Jul 2006 12:38:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 5 Jul 2006 12:38:53 -0000
Received: (qmail 72652 invoked by uid 500); 5 Jul 2006 12:38:51 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 72595 invoked by uid 500); 5 Jul 2006 12:38:51 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 72577 invoked by uid 500); 5 Jul 2006 12:38:51 -0000
Received: (qmail 72572 invoked by uid 99); 5 Jul 2006 12:38:51 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jul 2006 05:38:51 -0700
X-ASF-Spam-Status: No, hits=-8.6 required=10.0
	tests=ALL_TRUSTED,DATE_IN_PAST_12_24,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jul 2006 05:38:43 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6CE961A9897; Tue,  4 Jul 2006 13:58:29 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r419097 -
 /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
Date: Tue, 04 Jul 2006 20:58:29 -0000
To: ant-cvs@apache.org
From: stevel@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060704205829.6CE961A9897@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: stevel
Date: Tue Jul  4 13:58:28 2006
New Revision: 419097

URL: http://svn.apache.org/viewvc?rev=419097&view=rev
Log:
bug 36033; javadocs incorrect

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java?rev=419097&r1=419096&r2=419097&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java Tue Jul  4 13:58:28 2006
@@ -263,12 +263,11 @@
 
     /**
      * Sets behavior for when a duplicate file is about to be added -
-     * one of <code>keep</code>, <code>skip</code> or <code>overwrite</code>.
-     * Possible values are: <code>keep</code> (keep both
-     * of the files); <code>skip</code> (keep the first version
-     * of the file found); <code>overwrite</code> overwrite the file
-     * with the new file
-     * Default for zip tasks is <code>keep</code>
+     * one of <code>add</code>, <code>preserve</code> or <code>fail</code>.
+     * Possible values are: <code>add</code> (keep both
+     * of the files); <code>preserve</code> (keep the first version
+     * of the file found); <code>fail</code> halt a problem
+     * Default for zip tasks is <code>add</code>
      * @param df a <code>Duplicate</code> enumerated value
      */
     public void setDuplicate(Duplicate df) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org