=== modified file 'lisp/erc/erc-log.el'
--- lisp/erc/erc-log.el	2012-01-19 07:21:25 +0000
+++ lisp/erc/erc-log.el	2012-04-05 17:53:30 +0000
@@ -113,9 +113,9 @@
 custom function which returns the directory part and set
 `erc-log-channels-directory' to its name."
   :group 'erc-log
-  :type '(choice (const :tag "Long style" erc-generate-log-file-name-long)
-		 (const :tag "Long, but with network name rather than server"
+  :type '(choice (const :tag "#channel!nick@server:port.txt" erc-generate-log-file-name-long)
+		 (const :tag "#channel!nick@network.txt"
 			erc-generate-log-file-name-network)
-		 (const :tag "Short" erc-generate-log-file-name-short)
-		 (const :tag "With date" erc-generate-log-file-name-with-date)
+		 (const :tag "#channel.txt" erc-generate-log-file-name-short)
+		 (const :tag "#channel@date.txt" erc-generate-log-file-name-with-date)
 		 (function :tag "Other function")))

 (defcustom erc-truncate-buffer-on-save nil