Merge from emacs-24; up to 2012-05-07T21:26:08Z!rgm@gnu.org

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 82fb5eb4975..76f06edaacb 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-28  Leo Liu  <sdl.web@gmail.com>
+
+        * files.texi (Files): Fix typo.
+
 2012-09-23  Chong Yidong  <cyd@gnu.org>
 
         * buffers.texi (Read Only Buffers): Document read-only-mode.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 56971bf0ff0..9424a661236 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -29,7 +29,7 @@ arguments, except where noted.  @xref{Magic File Names}, for details.
   When file I/O functions signal Lisp errors, they usually use the
 condition @code{file-error} (@pxref{Handling Errors}).  The error
 message is in most cases obtained from the operating system, according
-to locale @code{system-message-locale}, and decoded using coding system
+to locale @code{system-messages-locale}, and decoded using coding system
 @code{locale-coding-system} (@pxref{Locales}).
 
 @menu