aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/misc/ChangeLog1
-rw-r--r--doc/misc/erc.texi2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 616b3574037..0e43b9ffe4d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * erc.texi (Advanced Usage, Options): Add descriptions and examples 3 * erc.texi (Advanced Usage, Options): Add descriptions and examples
4 for erc-format-nick-function and erc-rename-buffers options. 4 for erc-format-nick-function and erc-rename-buffers options.
5 (Connecting): fix typo
5 6
62014-12-29 Michael Albinus <michael.albinus@gmx.de> 72014-12-29 Michael Albinus <michael.albinus@gmx.de>
7 8
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 866d8486969..1c733bd03ac 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -591,7 +591,7 @@ other nicks are tried in the list order.
591@defopt erc-format-nick-function 591@defopt erc-format-nick-function
592A function to format a nickname for message display 592A function to format a nickname for message display
593 593
594You can set this to @code{erc-format-@OA@nick} to display user mode prefix 594You can set this to @code{erc-format-@@nick} to display user mode prefix
595@end defopt 595@end defopt
596 596
597@example 597@example