Add information about carriage-return in lispref.

* doc/lispref/nonascii.texi (Coding System Basics): Add information about carriage-return.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a1503ea4ddedabd6671a82daac607ea87cb35d64..921e54eb5c1ae842b45039ba001d459d7aaa9091 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-21  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * nonascii.texi (Coding System Basics): Add information about carriage-return.
+
 2013-09-14  Eli Zaretskii  <eliz@gnu.org>
 
        * display.texi (Display Margins): State the units of measuring

diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index e8e810ce61f243493e1d34cea6681736203da58f..6ae6fa1bf7ca39b85a9a499a9a8824e3aec7777d 100644 (file)
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -962,7 +962,8 @@ Unix convention, used on GNU and Unix systems, is to use the linefeed
 character (also called newline).  The DOS convention, used on
 MS-Windows and MS-DOS systems, is to use a carriage-return and a
 linefeed at the end of a line.  The Mac convention is to use just
-carriage-return.
+carriage-return.  (This was the convention used on the Macintosh
+system prior to OS X.)
 
 @cindex base coding system
 @cindex variant coding system