aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/erc.texi2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ae6a2893dbe..ca09606d9a4 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12014-10-03 Eli Zaretskii <eliz@gnu.org>
2
3 * erc.texi (Connecting): Remove stray "OA" that failed the manual
4 build.
5
12014-10-03 Kelvin White <kwhite@gnu.org> 62014-10-03 Kelvin White <kwhite@gnu.org>
2 7
3 * erc.texi (Advanced Usage, Options): Add descriptions and examples 8 * erc.texi (Advanced Usage, Options): Add descriptions and examples
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 556756a2793..bcdae1e84db 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