(Command Loop Info): Explain how read-event affects this-command-keys.

[gnu-emacs] / man / url.texi

diff --git a/man/url.texi b/man/url.texi
index cfc62fe0739d56d18c6dfef4b00c155cde871e77..453ae4a206f7d0155a75b433b9bac238c82fbef4 100644 (file)
--- a/man/url.texi
+++ b/man/url.texi
@@ -21,9 +21,9 @@
 @ifnottex
 This file documents the URL loading package.
 
-Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004,
-   2005 Free Software Foundation, Inc.
-Copyright (C) 1993, 1994, 1995, 1996  William M. Perry
+Copyright @copyright{} 1996, 1997, 1998, 1999, 2002, 2004,
+2005, 2006 Free Software Foundation, Inc.@*
+Copyright @copyright{} 1993, 1994, 1995, 1996  William M. Perry
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -52,7 +52,7 @@ License.''
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1993, 1994, 1995, 1996 William M. Perry@*
 Copyright @copyright{} 1996, 1997, 1998, 1999, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -559,6 +559,8 @@ Well-known ports are used if the URL does not specify a port.
 @cindex IRC
 @cindex Internet Relay Chat
 @cindex ZEN IRC
+@cindex ERC
+@cindex rcirc
 @c Fixme: reference (was http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt)
 @dfn{Internet Relay Chat} (IRC) is handled by handing off the @sc{irc}
 session to a function named in @code{url-irc-function}.
@@ -569,8 +571,14 @@ This function
 must take five arguments, @var{host}, @var{port}, @var{channel},
 @var{user} and @var{password}.  The @var{channel} argument specifies the
 channel to join immediately, this can be @code{nil}.  By default this is
-@code{url-irc-zenirc}.
+@code{url-irc-rcirc}.
 @end defopt
+@defun url-irc-rcirc host port channel user password
+Processes the arguments and lets @code{rcirc} handle the session.
+@end defun
+@defun url-irc-erc host port channel user password
+Processes the arguments and lets @code{ERC} handle the session.
+@end defun
 @defun url-irc-zenirc host port channel user password
 Processes the arguments and lets @code{zenirc} handle the session.
 @end defun
@@ -934,7 +942,7 @@ This is a regular expression that matches the shell prompt.
 Host to @samp{rlogin} to before telnetting out.
 @end defopt
 @defopt url-gateway-rlogin-parameters
-Parametres to pass to @samp{rsh}.
+Parameters to pass to @samp{rsh}.
 @end defopt
 @defopt url-gateway-rlogin-user-name
 User name to use when logging in to the gateway.