[Erc-commit] [commit][emacs22] Merged from erc--rel--5.1 (release ERC 5.1.3).

[mwolson]

commit 573606aefd8431a745ce01b1d552f8c426a54a0f
Author: Michael Olson <address@hidden>
Date:   Mon Jul 10 04:39:29 2006 +0000

    Merged from erc--rel--5.1 (release ERC 5.1.3).
    
    Patches applied:
    
     * address@hidden/erc--rel--5.1--patch-21
       Get documentation into a state I'm happy with.
    
     * address@hidden/erc--rel--5.1--patch-22
       erc-log: Use defaults that yield best speed.
    
     * address@hidden/erc--rel--5.1--patch-23
       erc-identd: Fix compiler error.
    
     * address@hidden/erc--rel--5.1--patch-24
       erc-autoaway: Fix error on returning from being away.
    
     * address@hidden/erc--rel--5.1--patch-25
       Update NEWS.
    
     * address@hidden/erc--rel--5.1--patch-26
       Release ERC 5.1.3.
    git-archimport-id: address@hidden/erc--main--0--patch-20

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 7053c31..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-{arch}
-.arch-ids
-*.elc
diff --git a/ChangeLog b/ChangeLog
index 97e20ee..703452f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,44 @@
 2006-07-09  Michael Olson  <address@hidden>
 
+       * erc.el (erc-version-string): Release ERC 5.1.3.
+
+       * erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
+
+       * servers.pl: Add copyright notice.
+
+       * erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
+       from being set automatically away and current buffer is not an ERC
+       buffer.
+
+       * erc-identd.el: Fix compiler error.
+
+       * erc.texi (Development): Use @subheading instead of @subsection.
+       (Advanced Usage): Add menu.
+       (Connecting): Fully document how to connect to an IRC server.
+       (Options, Tips and Tricks, Sample Configuration): New unwritten
+       sections.
+
+       * erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
+       (erc-user-full-name, erc-password): Docfixes and customization
+       interface tweaks.
+       (erc-try-new-nick-p): Rename from
+       `erc-manual-set-nick-on-bad-nick-p' and invert meaning.
+       (erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
+       of `erc-nick-uniquifier', in case someone wants multiple
+       characters.
+       (erc-compute-server, erc-compute-nick, erc-compute-full-name)
+       (erc-compute-port): Docfixes.
+
+       * FOR-RELEASE: Put in future-first order.
+
        * erc-log.el (log): Move all add-hook calls here, rather than
        executing them immediately, and also cause them to be un-hooked
        when the module is removed.
+       (erc-save-buffer-on-part): Move next to
+       `erc-save-queries-on-quit'.
+       (erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
+       (erc-log-write-after-send, erc-log-write-after-insert): Default to
+       nil.  This makes things fast, but reasonably failsafe, by default.
 
 2006-07-08  Michael Olson  <address@hidden>
 
diff --git a/FOR-RELEASE b/FOR-RELEASE
index fdc56aa..c37607d 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -1,5 +1,33 @@
 Tasks that need to be accomplished in order for a release to happen.
 
+* 5.2 release (future)
+
+** Documentation
+
+*** Items with "@c PRE5_2" won't block the 5.1 release, but may block
+the release of 5.2.
+
+** Source
+
+*** Make erc-backend not need to (require) any other part of ERC.
+This will hopefully increase the chance that it will be useful for
+other IRC clients, like Circe.
+
+*** Add binding for S-TAB (backtab) that moves backwards by link.
+
+* next Emacs release
+
+** Source
+
+*** Make M-x erc start a session.
+New users never think of using M-x erc-select.
+
+*** Change keybinding definitions for `erc-track-switch-buffer'.
+`C-c C-SPC' / `C-c C-@' is set as a global keybinding and is known to
+conflict with rcirc, for example.  Would setting `erc-track-mode-map'
+work?  Otherwise we could encourage people to use something like
+`C-c e SPC' or `C-c c'.
+
 * 5.1 release
 
 ** [DONE] Documentation
@@ -50,34 +78,6 @@ install-info: muse.info
 *** Remove dependency on cl package.
 (eval-when-compile (require 'cl)) is acceptable.
 
-* 5.2 release (future)
-
-** Documentation
-
-*** Items with "@c PRE5_2" won't block the 5.1 release, but may block
-the release of 5.2.
-
-** Source
-
-*** Make erc-backend not need to (require) any other part of ERC.
-This will hopefully increase the chance that it will be useful for
-other IRC clients, like Circe.
-
-*** Add binding for S-TAB (backtab) that moves backwards by link.
-
-* next Emacs release
-
-** Source
-
-*** Make M-x erc start a session.
-New users never think of using M-x erc-select.
-
-*** Change keybinding definitions for `erc-track-switch-buffer'.
-`C-c C-SPC' / `C-c C-@' is set as a global keybinding and is known to
-conflict with rcirc, for example.  Would setting `erc-track-mode-map'
-work?  Otherwise we could encourage people to use something like
-`C-c e SPC' or `C-c c'.
-
 
 Local variables:
 mode: outline
diff --git a/Makefile b/Makefile
index 2695c91..8214633 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-VERSION=5.1.2
+VERSION=5.1.3
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.1.1-3
+LASTUPLOAD = 5.1.2-1
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
diff --git a/NEWS b/NEWS
index 6887a94..b735089 100644
--- a/NEWS
+++ b/NEWS
@@ -8,12 +8,10 @@ ERC NEWS                                                      
 -*- outline -*-
 
 **** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 
-* Changes in ERC 5.1.3 (unreleased)
+* Changes in ERC 5.1.3
 
 ** Fix use of /quote command with no initial whitespace.
 
-** Changes and additions to modules
-
 ** Make it possible to customize the colorization of the header line.
 The `erc-header-line' face is used to color the header line.
 The `erc-header-line-face-method' determines the method to use when
@@ -23,6 +21,42 @@ colorizing the header line.
 candidate to use for `url-irc-function'.  This permits some
 integration of url.el and ERC.
 
+** Fix several errors that occur when server or channel buffers are killed
+prematurely.
+
+** Fix toggling of flood control.
+
+** Match the patterns in `erc-encoding-coding-alist' as regexps,
+instead of verbatim text.  Also, match case-insensitively.
+
+** The /SMV command has been removed, since we no longer have
+meaningful module-specific version information.
+
+** Fix a "(stringp nil)" error that can happen when doing /PART.
+
+** Use a better example in the `erc-part-reason-various-alist'
+documentation.
+
+** When using `erc-quit-reason-various' and `erc-part-reason-various'
+and no matches are found, default to using the ERC version string
+rather than "nil".
+
+** Add the `list' and `page' modules to the `erc-modules' customize
+interface.
+
+** Changes to the ERC manual
+
+*** Update the list of available modules.
+
+*** Revise information about releases and development.
+
+*** Provide a simpler example in the "Getting Started" chapter.
+
+*** Fully document how to connect to an IRC server in the new
+"Connecting" chapter.
+
+** Changes and additions to modules
+
 *** Autoaway (erc-autoaway.el)
 
 **** Rename the `erc-autoaway-use-emacs-idle' option to
@@ -34,6 +68,10 @@ This is now the default.
 **** If you set the AWAY status yourself, erc-autoaway will not
 interfere by un-setting AWAY prematurely.
 
+**** If you are set away while visiting a non-ERC buffer,
+erc-autoaway used to fail in bringing the user back.  This is now
+fixed.
+
 *** BBDB (erc-bbdb.el)
 
 **** Add new option `erc-bbdb-electric-p', which determines whether
@@ -49,6 +87,33 @@ to make the BBDB buffer electric.  This defaults to not 
electric.
 
 **** Make this work with Emacs 22.
 
+**** Provide a real ERC module named `identd'.
+
+**** Don't create an extra buffer for the identd process.
+
+*** Logging (erc-log.el)
+
+**** By default, don't insert old logs when opening an ERC buffer.
+This may be changed by customizing `erc-log-insert-log-on-open'.
+
+**** New option `erc-log-write-after-send' determines whether the
+log file will be written to after every sent message.  The default is
+not to do this.
+
+**** New option `erc-log-write-after-insert' determines whether the
+log file will be written to when new text is added to a logged ERC
+buffer.  The default is not to do this.  With this option and the
+previous option, logging should no longer slow down ERC as much.
+
+**** Default to saving buffers and queries on quit.
+This may be changed by customizing the `erc-save-buffer-on-quit' and
+`erc-save-queries-on-quit' options, respectively.
+
+**** Only perform logging when the `logging' module is added to
+`erc-modules'.  This prevents logging from being activated just by
+loading the erc-log.el file, and makes logging act like other ERC
+modules.
+
 *** Programmable completion (erc-pcomplete.el)
 
 **** Don't complete the user's current nickname.
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 4eba453..4614bd7 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -194,9 +194,10 @@ talk on another net too."
 
 (defun erc-autoaway-set-back ()
   "Discard the away state globally."
-  (when (and erc-autoaway-caused-away
-            (erc-away-p))
-    (erc-cmd-GAWAY "")))
+  (let ((server-buffer (car (erc-buffer-list #'erc-server-buffer-p))))
+    (when (and erc-autoaway-caused-away
+              (with-current-buffer server-buffer (erc-away-p)))
+      (erc-cmd-GAWAY ""))))
 
 (defun erc-autoaway-possibly-set-away (current-time)
   "Set autoaway when `erc-auto-set-away' is true and the idletime is
diff --git a/erc-identd.el b/erc-identd.el
index 9e4a1f5..32bfa33 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -38,6 +38,8 @@
 
 ;;; Code:
 
+(require 'erc)
+
 (defvar erc-identd-process nil)
 
 ;;;###autoload (autoload 'erc-identd-mode "erc-identd")
diff --git a/erc-log.el b/erc-log.el
index 752d712..dc5ba7d 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -115,11 +115,6 @@ SERVER and PORT are the parameters used to connect BUFFERs
                 (const erc-generate-log-file-name-with-date)
                 (symbol)))
 
-(defcustom erc-save-buffer-on-part nil
-  "*Save the channel buffer content using `erc-save-buffer-in-logs' on PART."
-  :group 'erc-log
-  :type 'boolean)
-
 (defcustom erc-truncate-buffer-on-save nil
   "Truncate any ERC (channel, query, server) buffer when it is saved."
   :group 'erc-log
@@ -155,13 +150,23 @@ directory should not end with a trailing slash."
   :group 'erc-log
   :type 'boolean)
 
-(defcustom erc-save-queries-on-quit nil
-  "Save all query (also channel) buffers of the server on QUIT.
-See the variable `erc-save-buffer-on-part' for details."
+(defcustom erc-save-buffer-on-part t
+  "*Save the channel buffer content using `erc-save-buffer-in-logs' on PART.
+
+If you set this to nil, you may want to enable both
+`erc-log-write-after-send' and `erc-log-write-after-insert'."
+  :group 'erc-log
+  :type 'boolean)
+
+(defcustom erc-save-queries-on-quit t
+  "*Save all query (also channel) buffers of the server on QUIT.
+
+If you set this to nil, you may want to enable both
+`erc-log-write-after-send' and `erc-log-write-after-insert'."
   :group 'erc-log
   :type 'boolean)
 
-(defcustom erc-log-write-after-send t
+(defcustom erc-log-write-after-send nil
   "*If non-nil, write to log file after every message you send.
 
 If you set this to nil, you may want to enable both
@@ -169,7 +174,7 @@ If you set this to nil, you may want to enable both
   :group 'erc-log
   :type 'boolean)
 
-(defcustom erc-log-write-after-insert t
+(defcustom erc-log-write-after-insert nil
   "*If non-nil, write to log file when new text is added to a
 logged ERC buffer.
 
diff --git a/erc.el b/erc.el
index 1bc71d6..1202a1c 100644
--- a/erc.el
+++ b/erc.el
@@ -67,7 +67,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2 (devel)"
+(defconst erc-version-string "Version 5.1.3 (devel)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -144,57 +144,69 @@
 ;; tunable connection and authentication parameters
 
 (defcustom erc-server nil
-  "IRC server to use.
+  "IRC server to use if one is not provided.
 See function `erc-compute-server' for more details on connection
 parameters and authentication."
   :group 'erc
-  :type '(choice (const nil) string))
+  :type '(choice (const :tag "None" nil)
+                (string :tag "Server")))
 
 (defcustom erc-port nil
-  "IRC port to use."
+  "IRC port to use if not specified.
+
+This can be either a string or a number."
   :group 'erc
-  :type '(choice (const nil) number string))
+  :type '(choice (const :tag "None" nil)
+                (const :tag "Port number" number)
+                (const :tag "Port string" string)))
 
 (defcustom erc-nick nil
-  "Nickname to use.
+  "Nickname to use if one is not provided.
 
-Can be either a string, or a list of strings.
+This can be either a string, or a list of strings.
 In the latter case, if the first nick in the list is already in use,
 other nicks are tried in the list order.
 
 See function `erc-compute-nick' for more details on connection
 parameters and authentication."
   :group 'erc
-  :type '(choice (const nil)
+  :type '(choice (const :tag "None" nil)
                 (string :tag "Nickname")
-                (repeat string)))
+                (repeat (string :tag "Nickname"))))
 
 (defcustom erc-nick-uniquifier "`"
-  "The character to append to the nick if it is already in use."
+  "The string to append to the nick if it is already in use."
   :group 'erc
   :type 'string)
 
-(defcustom erc-manual-set-nick-on-bad-nick-p nil
-  "If the nickname you chose isn't available, ERC should not automatically
-attempt to set another nickname.  You can manually set another nickname with
-the /NICK command."
+(defcustom erc-try-new-nick-p t
+  "If the nickname you chose isn't available, and this option is non-nil,
+ERC should automatically attempt to connect with another nickname.
+
+You can manually set another nickname with the /NICK command."
   :group 'erc
   :type 'boolean)
 
 (defcustom erc-user-full-name nil
   "User full name.
 
+This can be either a string or a function to call.
+
 See function `erc-compute-full-name' for more details on connection
 parameters and authentication."
   :group 'erc
-  :type '(choice (const nil) string function)
+  :type '(choice (const :tag "No name" nil)
+                (string :tag "Name")
+                (function :tag "Get from function"))
   :set (lambda (sym val)
         (if (functionp val)
             (set sym (funcall val))
           (set sym val))))
 
 (defvar erc-password nil
-  "ERC password to use in authentication (not necessary).")
+  "Password to use when authenticating to an IRC server.
+It is not strictly necessary to provide this, since ERC will
+prompt you for it.")
 
 (defcustom erc-user-mode nil
   "Initial user modes to be set after a connection is established."
@@ -2077,10 +2089,12 @@ Non-interactively, it takes keyword arguments
    (full-name (erc-compute-full-name)))
 
 That is, if called with
+
    (erc-select :server \"irc.freenode.net\" :full-name \"Harry S Truman\")
+
 server and full-name will be set to those values, whereas
-erc-compute-port, erc-compute-nick and erc-compute-full-name will
-be invoked for those parameters' values"
+`erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
+be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
 
   (run-hook-with-args 'erc-before-connect server port nick)
@@ -3727,7 +3741,7 @@ E.g. \"Read error to Nick address@hidden: 110\" would be 
shortened to
   "If NICK is unavailable, tell the user the REASON.
 
 See also `erc-display-error-notice'."
-  (if (or erc-manual-set-nick-on-bad-nick-p
+  (if (or (not erc-try-new-nick-p)
          ;; how many default-nicks are left + one more try...
          (eq erc-nick-change-attempt-count
              (if (consp erc-nick)
@@ -3749,12 +3763,13 @@ See also `erc-display-error-notice'."
          (setq newnick (concat (truncate-string-to-width
                                 nick
                                 (if (and erc-server-connected nicklen)
-                                    (- (string-to-number nicklen) 1)
+                                    (- (string-to-number nicklen)
+                                       (length erc-nick-uniquifier))
                                   ;; rfc2812 max nick length = 9
                                   ;; we must assume this is the
                                   ;; server's setting if we haven't
                                   ;; established a connection yet
-                                  8))
+                                  (- 9 (length erc-nick-uniquifier))))
                                erc-nick-uniquifier)))
       (erc-cmd-NICK newnick)
       (erc-display-error-notice
@@ -5401,28 +5416,28 @@ Sets the buffer local variables:
 (defun erc-compute-server (&optional server)
   "Return an IRC server name.
 
-Tries a number of increasingly more default methods until a non-nil value is
-found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- SERVER
-- `erc-server'
+- SERVER (the argument passwd to this function)
+- The `erc-server' option
 - The value of the IRCSERVER environment variable
-- `erc-default-server'."
+- The `erc-default-server' variable"
   (or server
       erc-server
       (getenv "IRCSERVER")
       erc-default-server))
 
 (defun erc-compute-nick (&optional nick)
-  "Return user's NICK.
+  "Return user's IRC nick.
 
-Tries a number of increasingly more default methods until a non-nil value is
-found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- NICK
-- `erc-nick'
+- NICK (the argument passed to this function)
+- The `erc-nick' option
 - The value of the IRCNICK environment variable
-- via the function `user-login-name'."
+- The result from the `user-login-name' function"
   (or nick
       (if (consp erc-nick) (car erc-nick) erc-nick)
       (getenv "IRCNICK")
@@ -5430,15 +5445,15 @@ found:
 
 
 (defun erc-compute-full-name (&optional full-name)
-  "Return user's FULL-NAME.
+  "Return user's full name.
 
-Tries a number of increasingly more default methods until a non-nil value is
-found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- FULL-NAME
-- `erc-user-full-name'
+- FULL-NAME (the argument passed to this function)
+- The `erc-user-full-name' option
 - The value of the IRCNAME environment variable
-- via the function `user-full-name'."
+- The result from the `user-full-name' function"
   (or full-name
       erc-user-full-name
       (getenv "IRCNAME")
@@ -5448,12 +5463,13 @@ found:
 (defun erc-compute-port (&optional port)
   "Return a port for an IRC server.
 
-Tries a number of increasingly more default methods until a non-nil
-value is found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- PORT
-- \"ircd\"."
-  (or port erc-port "ircd"))
+- PORT (the argument passed to this function)
+- The `erc-port' option
+- The `erc-default-port' variable"
+  (or port erc-port erc-default-port))
 
 ;; time routines
 
diff --git a/erc.texi b/erc.texi
index ee2f699..cfa7743 100644
--- a/erc.texi
+++ b/erc.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.1.2.
+This manual is for ERC version 5.1.3.
 
 Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc.
 
@@ -73,6 +73,13 @@ Obtaining ERC
 * Releases::                    Released versions of ERC.
 * Development::                 Latest unreleased development changes.
 
+Advanced Usage
+
+* Connecting::                  Ways of connecting to an IRC server.
+* Options::                     Options that are available for ERC.
+* Tips and Tricks::             Ways of enhancing your ERC experience.
+* Sample Configuration::        An example configuration file.
+
 @end detailmenu
 @end menu
 
@@ -139,7 +146,7 @@ Alternatively, you can download the latest release from
 Choose the development version if you want to live on the bleeding edge
 of ERC development or try out new features before release.
 
address@hidden GNU Arch
address@hidden GNU Arch
 
 ERC is developed using GNU Arch.  Downloading ERC with Arch and staying
 up-to-date involves the following steps.
@@ -190,7 +197,7 @@ If you are new to Arch and want to learn more about 
developing with it,
 you might find this tutorial helpful:
 @uref{http://www.mwolson.org/projects/ArchTutorial.html}.
 
address@hidden Development snapshots
address@hidden Development snapshots
 
 @cindex development snapshot
 Alternatively, the latest development snapshot may be downloaded in both
@@ -506,14 +513,175 @@ Translate morse code in messages
 @chapter Advanced Usage
 @cindex advanced topics
 
-Write me.
address@hidden
+* Connecting::                  Ways of connecting to an IRC server.
+* Options::                     Options that are available for ERC.
+* Tips and Tricks::             Ways of enhancing your ERC experience.
+* Sample Configuration::        An example configuration file.
address@hidden menu
+
address@hidden Connecting, Options, Advanced Usage, Advanced Usage
address@hidden  node-name,  next,  previous,  up
address@hidden Connecting to an IRC Server
address@hidden connecting
+
+The easiest way to connect to an IRC server is to call
address@hidden erc-select}.  If you want to assign this function to a
+keystroke, the following will help you figure out its parameters.
+
address@hidden erc-select
+Select connection parameters and run ERC.
+Non-interactively, it takes the following keyword arguments.
+
address@hidden @bullet
address@hidden @var{server}
address@hidden @var{port}
address@hidden @var{nick}
address@hidden @var{password}
address@hidden @var{full-name}
address@hidden itemize
+
+That is, if called with the following arguments, @var{server} and
address@hidden will be set to those values, whereas
address@hidden, @code{erc-compute-nick} and
address@hidden will be invoked for the values of the other
+parameters.
+
address@hidden
+(erc-select :server "irc.freenode.net" :full-name "Harry S Truman")
address@hidden example
address@hidden defun
+
address@hidden Server
+
address@hidden erc-compute-server &optional server
+Return an IRC server name.
+
+This tries a number of increasingly more default methods until a non-nil
+value is found.
+
address@hidden @bullet
address@hidden @var{server} (the argument passed to this function)
address@hidden The @code{erc-server} option
address@hidden The value of the IRCSERVER environment variable
address@hidden The @code{erc-default-server} variable
address@hidden itemize
+
address@hidden defun
+
address@hidden erc-server nil
+IRC server to use if one is not provided.
address@hidden defopt
+
address@hidden Port
+
address@hidden 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
+value is found.
+
address@hidden @bullet
address@hidden @var{port} (the argument passed to this function)
address@hidden The @code{erc-port} option
address@hidden The @code{erc-default-port} variable
address@hidden itemize
+
address@hidden defun
+
address@hidden erc-port
+IRC port to use if not specified.
 
address@hidden PRE5_2: (Node) Document every ERC option
+This can be either a string or a number.
address@hidden defopt
+
address@hidden Nick
+
address@hidden erc-compute-nick &optional nick
+Return user's IRC nick.
+
+This tries a number of increasingly more default methods until a
+non-nil value is found.
+
address@hidden
address@hidden @var{nick} (the argument passed to this function)
address@hidden The @code{erc-nick} option
address@hidden The value of the IRCNICK environment variable
address@hidden The result from the @code{user-login-name} function
address@hidden itemize
+
address@hidden defun
+
address@hidden erc-nick
+Nickname to use if one is not provided.
+
+This can be either a string, or a list of strings.
+In the latter case, if the first nick in the list is already in use,
+other nicks are tried in the list order.
address@hidden defopt
+
address@hidden erc-nick-uniquifier
+The string to append to the nick if it is already in use.
address@hidden defopt
+
address@hidden erc-try-new-nick-p
+If the nickname you chose isn't available, and this option is non-nil,
+ERC should automatically attempt to connect with another nickname.
+
+You can manually set another nickname with the /NICK command.
address@hidden defopt
+
address@hidden Full name
+
address@hidden erc-compute-full-name &optional full-name
+Return user's full name.
+
+This tries a number of increasingly more default methods until a
+non-nil value is found.
+
address@hidden @bullet
address@hidden @var{full-name} (the argument passed to this function)
address@hidden The @code{erc-user-full-name} option
address@hidden The value of the IRCNAME environment variable
address@hidden The result from the @code{user-full-name} function
address@hidden itemize
+
address@hidden defun
+
address@hidden erc-user-full-name
+User full name.
+
+This can be either a string or a function to call.
address@hidden defopt
+
address@hidden Options, Tips and Tricks, Connecting, Advanced Usage
address@hidden  node-name,  next,  previous,  up
address@hidden Options
address@hidden options
+
address@hidden PRE5_2: (Node) Document every ERC option (module options go in
address@hidden previous chapter)
+
+This section has not yet been written.
+
address@hidden Tips and Tricks, Sample Configuration, Options, Advanced Usage
address@hidden  node-name,  next,  previous,  up
address@hidden Tips and Tricks
address@hidden tips and tricks
 
 @c PRE5_2: (Node) Tips and tricks
 
+This section has not yet been written.
+
address@hidden Sample Configuration, , Tips and Tricks, Advanced Usage
address@hidden  node-name,  next,  previous,  up
address@hidden Sample Configuration
address@hidden configuration, sample
+
 @c PRE5_2: (Node) Sample configs
 
+This section has not yet been written.
+
 
 @node Getting Help and Reporting Bugs, History, Advanced Usage, Top
 @comment  node-name,  next,  previous,  up
diff --git a/servers.pl b/servers.pl
index 99c15a5..2d3f8d2 100755
--- a/servers.pl
+++ b/servers.pl
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+# Copyright (C) 2002 Free Software Foundation, Inc.
+
 # Convert mIRC's servers.ini to a elisp structure.
 # Get the file from http://www.mirc.co.uk/servers.ini