From: Glenn Morris <rgm@gnu.org>
Date: Wed, 5 Feb 2014 07:46:40 +0000 (-0800)
Subject: Some doc for url-cookie-list
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~170
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=645586dcd8979d58b3f8825404d6e1b630855753;p=emacs.git

Some doc for url-cookie-list

* lisp/url/url-cookie.el (url-cookie-list): Doc fix.

* doc/misc/url.texi (Cookies): Mention url-cookie-list command.

* etc/NEWS: Related edit.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c64e5e695dc..606a736999e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-05  Glenn Morris  <rgm@gnu.org>
+
+	* url.texi (Cookies): Mention url-cookie-list command.
+
 2014-02-03  Glenn Morris  <rgm@gnu.org>
 
 	* cl.texi (Blocks and Exits): Mention cl-tagbody.
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index ecfd0c66929..5cda62eade7 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -410,6 +410,13 @@ ignored; any other value means to ask the user on each request.
 @node Cookies
 @subsection Cookies
 
+@findex url-cookie-delete
+@defun url-cookie-list
+This command creates a @file{*url cookies*} buffer listing the current
+cookies, if there are any.  You can remove a cookie using the
+@kbd{C-k} (@code{url-cookie-delete}) command.
+@end defun
+
 @defopt url-cookie-file
 The file in which cookies are stored, defaulting to @file{cookies} in
 the directory specified by @code{url-configuration-directory}.
diff --git a/etc/NEWS b/etc/NEWS
index 11cb240890a..942dec98ea4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -871,8 +871,9 @@ which support POSIX ACLs.
 *** Handlers for `file-notify-add-watch' and `file-notify-rm-watch'
 for remote machines which support filesystem notifications.
 
-** New command `url-cookie-list' displays all the current cookies, and
-allows deleting selected cookies.
++++
+** New URL command `url-cookie-list' displays the current cookies,
+and allows you to interactively remove cookies.
 
 ** VC and related modes
 
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 3a82e4b3891..ac55bad13fb 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-05  Glenn Morris  <rgm@gnu.org>
+
+	* url-cookie.el (url-cookie-list): Doc fix.
+
 2014-01-25  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
 	* url-vars.el (url): Link to info manual.
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index f396da73e35..55e0fb33951 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -352,9 +352,9 @@ to run the `url-cookie-setup-save-timer' function manually."
 ;;; Mode for listing and editing cookies.
 
 (defun url-cookie-list ()
-  "List the URL cookies."
+  "Display a buffer listing the current URL cookies, if there are any.
+Use \\<url-cookie-mode-map>\\\[url-cookie-delete] to remove cookies."
   (interactive)
-
   (when (and (null url-cookie-secure-storage)
 	     (null url-cookie-storage))
     (error "No cookies are defined"))