aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorMichael Albinus2018-03-15 10:56:08 +0100
committerMichael Albinus2018-03-15 10:56:08 +0100
commit2b8507fbdce8228ccdbcbc31fe545a50330ddd51 (patch)
tree5cbbd0a4da7e8b48727a4eecfe015db28525fbf7 /doc/lispref
parent2616cd94f13edaf6db9ef600d9a79fa1be4807c5 (diff)
downloademacs-2b8507fbdce8228ccdbcbc31fe545a50330ddd51.tar.gz
emacs-2b8507fbdce8228ccdbcbc31fe545a50330ddd51.zip
Replace "carriage-return" by "carriage return" in manuals
* doc/emacs/msdos.texi: * doc/emacs/mule.texi: * doc/emacs/screen.texi: * doc/lispref/nonascii.texi: * doc/misc/calc.texi: Replace "carriage-return" by "carriage return". Suggested by Richard Stallman <rms@gnu.org> in emacs-manual-bugs@gnu.org.
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/nonascii.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 8bc7e209894..70df555d877 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1074,9 +1074,9 @@ that result from encoding unsupported characters.
1074used on various systems for representing end of line in files. The 1074used on various systems for representing end of line in files. The
1075Unix convention, used on GNU and Unix systems, is to use the linefeed 1075Unix convention, used on GNU and Unix systems, is to use the linefeed
1076character (also called newline). The DOS convention, used on 1076character (also called newline). The DOS convention, used on
1077MS-Windows and MS-DOS systems, is to use a carriage-return and a 1077MS-Windows and MS-DOS systems, is to use a carriage return and a
1078linefeed at the end of a line. The Mac convention is to use just 1078linefeed at the end of a line. The Mac convention is to use just
1079carriage-return. (This was the convention used in Classic Mac OS.) 1079carriage return. (This was the convention used in Classic Mac OS.)
1080 1080
1081@cindex base coding system 1081@cindex base coding system
1082@cindex variant coding system 1082@cindex variant coding system