* lisp/electric.el (electric-newline-and-maybe-indent): New command.

[bpt/emacs.git] / doc / misc / url.texi

diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index a5d40e8..9c9e4f5 100644 (file)
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -2,6 +2,8 @@
 @setfilename ../../info/url
 @settitle URL Programmer's Manual
 
+@documentencoding UTF-8
+
 @iftex
 @c @finalout
 @end iftex
@@ -20,7 +22,8 @@
 @copying
 This is the manual for the @code{url} Emacs Lisp library.
 
-Copyright @copyright{} 1993-1999, 2002, 2004-2012 Free Software Foundation, Inc.
+Copyright @copyright{} 1993--1999, 2002, 2004--2014 Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -137,7 +140,7 @@ Given a parsed URI, this function returns the corresponding URI string.
   The return value of @code{url-generic-parse-url}, and the argument
 expected by @code{url-recreate-url}, is a @dfn{parsed URI}: a CL
 structure whose slots hold the various components of the URI@.
-@xref{top,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for
+@xref{Top,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for
 details about CL structures.  Most of the other functions in the
 @code{url} library act on parsed URIs.
 
@@ -407,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}.
@@ -889,7 +899,7 @@ containing the data cached for that URL.
 
 @c With a large cache of documents on the local disk, it can be very handy
 @c when traveling, or any other time the network connection is not active
-@c (a laptop with a dial-on-demand PPP connection, etc).  Emacs/W3 can rely
+@c (a laptop with a dial-on-demand PPP connection, etc.).  Emacs/W3 can rely
 @c solely on its cache, and avoid checking to see if the page has changed
 @c on the remote server.  In the case of a dial-on-demand PPP connection,
 @c this will keep the phone line free as long as possible, only bringing up
@@ -1239,7 +1249,7 @@ if it exists.
 @defopt url-debug
 @cindex debugging
 Specifies the types of debug messages which are logged to
-the @code{*URL-DEBUG*} buffer.
+the @file{*URL-DEBUG*} buffer.
 @code{t} means log all messages.
 A number means log all messages and show them with @code{message}.
 It may also be a list of the types of messages to be logged.