Merge from trunk.

[gnu-emacs] / doc / misc / rcirc.texi

diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index c8c341534fe90de08aeac644a362140087f7c7aa..3e9ee928822b9f69eddb45d7680bf74bd906b06e 100644 (file)
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -5,7 +5,7 @@
 @c %**end of header
 
 @copying
-Copyright @copyright{} 2006, 2007, 2008, 2009, 2010, 2011
+Copyright @copyright{} 2006-2011
 Free Software Foundation, Inc.
 
 @quotation
@@ -509,8 +509,8 @@ This variable contains the default user name to report to the server.
 It defaults to the login name returned by @code{user-login-name}, just
 like @code{rcirc-default-nick}.
 
-@item rcirc-default-user-full-name
-@vindex rcirc-default-user-full-name
+@item rcirc-default-full-name
+@vindex rcirc-default-full-name
 @cindex full name
 @cindex real name
 @cindex surname
@@ -519,7 +519,7 @@ to the name returned by @code{user-full-name}.  If you want to hide
 your full name, you might want to set it to some pseudonym.
 
 @example
-(setq rcirc-default-user-full-name "Curious Minds Want To Know")
+(setq rcirc-default-full-name "Curious Minds Want To Know")
 @end example
 
 @item rcirc-authinfo
@@ -926,7 +926,7 @@ The real answer, therefore, is a @code{/reconnect} command:
        (delete-process process)
        (rcirc-connect server port nick
                       rcirc-default-user-name
-                      rcirc-default-user-full-name
+                      rcirc-default-full-name
                       channels))))
 @end smallexample
 
@@ -948,7 +948,3 @@ The real answer, therefore, is a @code{/reconnect} command:
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 2589e562-3843-4ffc-8c2f-477cbad57c01
-@end ignore