[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110863: * doc/misc/erc.texi: Use @code{nil} rather than just "nil".

[Glenn Morris]

------------------------------------------------------------
revno: 110863
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-11-13 00:16:58 -0800
message:
  * doc/misc/erc.texi: Use @code{nil} rather than just "nil".
modified:
  doc/misc/ChangeLog
  doc/misc/erc.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-11-13 08:14:15 +0000
+++ b/doc/misc/ChangeLog        2012-11-13 08:16:58 +0000
@@ -1,6 +1,7 @@
 2012-11-13  Glenn Morris  <address@hidden>
 
-       * erc.texi (Modules): Undocument obsolete "hecomplete".
+       * erc.texi: Use @code{nil} rather than just "nil".
+       (Modules): Undocument obsolete "hecomplete".
        Add "notifications".
        (Connecting): Add brief section on passwords.
        (Options): Make a start by adding erc-hide-list, erc-lurker-hide-list.

=== modified file 'doc/misc/erc.texi'
--- a/doc/misc/erc.texi 2012-11-13 08:14:15 +0000
+++ b/doc/misc/erc.texi 2012-11-13 08:16:58 +0000
@@ -530,7 +530,7 @@
 @defun erc-compute-server &optional server
 Return an IRC server name.
 
-This tries a number of increasingly more default methods until a non-nil
+This tries a number of increasingly more default methods until a address@hidden
 value is found.
 
 @itemize @bullet
@@ -542,7 +542,7 @@
 
 @end defun
 
address@hidden erc-server nil
address@hidden erc-server
 IRC server to use if one is not provided.
 @end defopt
 
@@ -551,7 +551,7 @@
 @defun erc-compute-port &optional port
 Return a port for an IRC server.
 
-This tries a number of increasingly more default methods until a non-nil
+This tries a number of increasingly more default methods until a address@hidden
 value is found.
 
 @itemize @bullet
@@ -574,7 +574,7 @@
 Return user's IRC nick.
 
 This tries a number of increasingly more default methods until a
-non-nil value is found.
address@hidden value is found.
 
 @itemize
 @item @var{nick} (the argument passed to this function)
@@ -598,7 +598,7 @@
 @end defopt
 
 @defopt erc-try-new-nick-p
-If the nickname you chose isn't available, and this option is non-nil,
+If the nickname you chose isn't available, and this option is address@hidden,
 ERC should automatically attempt to connect with another nickname.
 
 You can manually set another nickname with the /NICK command.
@@ -634,7 +634,7 @@
 Return user's full name.
 
 This tries a number of increasingly more default methods until a
-non-nil value is found.
address@hidden value is found.
 
 @itemize @bullet
 @item @var{full-name} (the argument passed to this function)