<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1144,14 +1144,24 @@ public final class MemcachedClient extends SpyThread {
 	/**
 	 * Delete the given key from the cache.
 	 *
+	 * &lt;p&gt;
+	 * The hold argument specifies the amount of time in seconds (or Unix time
+	 * until which) the client wishes the server to refuse &quot;add&quot; and &quot;replace&quot;
+	 * commands with this key. For this amount of item, the item is put into a
+	 * delete queue, which means that it won't possible to retrieve it by the
+	 * &quot;get&quot; command, but &quot;add&quot; and &quot;replace&quot; command with this key will also
+	 * fail (the &quot;set&quot; command will succeed, however). After the time passes,
+	 * the item is finally deleted from server memory.
+	 * &lt;/p&gt;
+	 *
 	 * @param key the key to delete
-	 * @param when when the deletion should take effect
+	 * @param hold how long the key should be unavailable to add commands
 	 */
-	public Future&lt;Boolean&gt; delete(String key, int when) {
+	public Future&lt;Boolean&gt; delete(String key, int hold) {
 		final CountDownLatch latch=new CountDownLatch(1);
 		final OperationFuture&lt;Boolean&gt; rv=new OperationFuture&lt;Boolean&gt;(latch,
 			operationTimeout);
-		DeleteOperation op=opFact.delete(key, when,
+		DeleteOperation op=opFact.delete(key, hold,
 				new OperationCallback() {
 					public void receivedStatus(OperationStatus s) {
 						rv.set(s.isSuccess());
@@ -1165,7 +1175,7 @@ public final class MemcachedClient extends SpyThread {
 	}
 
 	/**
-	 * Shortcut to delete that will immediately delete the item from the cache.
+	 * Shortcut to delete that doesn't put a hold on the key.
 	 */
 	public Future&lt;Boolean&gt; delete(String key) {
 		return delete(key, 0);</diff>
      <filename>src/main/java/net/spy/memcached/MemcachedClient.java</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>f1969bf1f88b62a71dcc9f392c4c9f0756fcea09</id>
    </parent>
  </parents>
  <author>
    <name>Dustin Sallings</name>
    <email>dustin@spy.net</email>
  </author>
  <url>http://github.com/dustin/java-memcached-client/commit/9de48599d5a18cb5d59779e7c28713b517285aa4</url>
  <id>9de48599d5a18cb5d59779e7c28713b517285aa4</id>
  <committed-date>2008-05-13T22:41:39-07:00</committed-date>
  <authored-date>2008-05-13T22:41:39-07:00</authored-date>
  <message>Updated delete documentation.</message>
  <tree>650180506dee0d0caf6d3470c80149565588642a</tree>
  <committer>
    <name>Dustin Sallings</name>
    <email>dustin@spy.net</email>
  </committer>
</commit>
