From c6487170e39e5b58872e935c95e8d033554501f7 Mon Sep 17 00:00:00 2001
From: kwhite <kwhite@gnu.org>
Date: Wed, 4 Feb 2015 11:23:10 -0500
Subject: [PATCH] Update ERC docs and update MAINTANERS to include myself

---
 admin/ChangeLog    |  4 ++++
 admin/MAINTAINERS  |  5 +++++
 doc/misc/ChangeLog |  5 +++++
 doc/misc/erc.texi  | 31 ++++++++++++++++++++++++-------
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 88d996532e0..0f70469fc0c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-04  Kelvin White  <kwhite@gnu.org>
+
+	* MAINTAINERS: Add myself to section 2
+
 2015-02-02  Glenn Morris  <rgm@gnu.org>
 
 	* admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 1a5c64191ff..04942a8c3c9 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -78,6 +78,11 @@ Bastien Guerry
 2.
 ==============================================================================
 
+Kelvin White
+       ERC
+           lisp/erc/*
+           doc/misc/erc.texi
+
 Eli Zaretskii
     	doc/*
 	lispref/*
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 71469b51808..616b3574037 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-04  Kelvin White  <kwhite@gnu.org>
+
+	* erc.texi (Advanced Usage, Options): Add descriptions and examples
+	for erc-format-nick-function and erc-rename-buffers options.
+
 2014-12-29  Michael Albinus  <michael.albinus@gmx.de>
 
 	Sync with Tramp 2.2.11.
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index ffb8cd6455c..866d8486969 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -588,6 +588,16 @@ In the latter case, if the first nick in the list is already in use,
 other nicks are tried in the list order.
 @end defopt
 
+@defopt erc-format-nick-function
+A function to format a nickname for message display
+
+You can set this to @code{erc-format-@OA@nick} to display user mode prefix
+@end defopt
+
+@example
+(setq erc-format-nick-function 'erc-format-@@nick)
+@end example
+
 @defopt erc-nick-uniquifier
 The string to append to the nick if it is already in use.
 @end defopt
@@ -657,13 +667,6 @@ your Emacs configuration file.  Everything after the @code{(require
 @lisp
 ;;; Sample ERC configuration
 
-;; Add the ERC directory to load path -- you don't need this if you are
-;; using the version of ERC that comes with Emacs
-(add-to-list 'load-path "~/elisp/erc")
-
-;; Load ERC
-(require 'erc)
-
 ;; Load authentication info from an external source.  Put sensitive
 ;; passwords and the like in here.
 (load "~/.emacs.d/.erc-auth")
@@ -712,6 +715,12 @@ stuff, to the current ERC buffer."
 ;; Join the #emacs and #erc channels whenever connecting to Freenode.
 (setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc")))
 
+;; Rename server buffers to reflect the current network name instead
+;; of SERVER:PORT. (e.g. "freenode" instead of "irc.freenode.net:6667"). This
+;; is useful when using a bouncer like ZNC where you have multiple
+;; connections to the same server.
+(setq erc-rename-buffers t)
+
 ;; Interpret mIRC-style color commands in IRC chats
 (setq erc-interpret-mirc-color t)
 
@@ -750,6 +759,14 @@ lurkers.  The function @code{erc-lurker-p} determines whether a given
 nickname is considered a lurker.
 @end defopt
 
+@defopt erc-rename-buffers
+If non, @code{nil}, this will rename server buffers to reflect the
+current network name instead of IP:PORT
+
+@example
+(setq erc-rename-buffers t)
+@end example
+@end defopt
 
 @node Getting Help and Reporting Bugs
 @chapter Getting Help and Reporting Bugs
-- 
2.11.4.GIT