[Emacs-diffs] trunk r114420: Add information about carriage-return in lispref.

[Xue Fuqiao]

------------------------------------------------------------
revno: 114420
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Sat 2013-09-21 18:58:39 +0800
message:
  Add information about carriage-return in lispref.
  
  * doc/lispref/nonascii.texi (Coding System Basics): Add information about 
carriage-return.
modified:
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/nonascii.texi      
nonascii.texi-20091113204419-o5vbwnq5f7feedwu-6202

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-09-14 09:24:34 +0000
+++ b/doc/lispref/ChangeLog     2013-09-21 10:58:39 +0000
@@ -1,3 +1,7 @@
+2013-09-21  Xue Fuqiao  <address@hidden>
+
+       * nonascii.texi (Coding System Basics): Add information about 
carriage-return.
+
 2013-09-14  Eli Zaretskii  <address@hidden>
 
        * display.texi (Display Margins): State the units of measuring

=== modified file 'doc/lispref/nonascii.texi'
--- a/doc/lispref/nonascii.texi 2013-09-12 14:21:21 +0000
+++ b/doc/lispref/nonascii.texi 2013-09-21 10:58:39 +0000
@@ -962,7 +962,8 @@
 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