From 4ce923bc7d8fbe0854ed031e3f905d07251f7af1 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Tue, 4 Jul 2006 20:58:28 +0000
Subject: [PATCH] bug 36033; javadocs incorrect

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@419097 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/Zip.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index 9d3386cc2..d92fd3cf6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -263,12 +263,11 @@ public class Zip extends MatchingTask {
 
     /**
      * 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) {