summaryrefslogtreecommitdiff
path: root/doc/emacs/screen.texi
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-03-15 10:56:08 +0100
committerMichael Albinus <michael.albinus@gmx.de>2018-03-15 10:56:08 +0100
commit2b8507fbdce8228ccdbcbc31fe545a50330ddd51 (patch)
tree5cbbd0a4da7e8b48727a4eecfe015db28525fbf7 /doc/emacs/screen.texi
parent2616cd94f13edaf6db9ef600d9a79fa1be4807c5 (diff)
downloademacs-2b8507fbdce8228ccdbcbc31fe545a50330ddd51.tar.gz
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/emacs/screen.texi')
-rw-r--r--doc/emacs/screen.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 19a4a9e4b6c..8f2be4b9a7e 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -205,11 +205,11 @@ terminal output. Furthermore, if you are using an input method,
string is displayed, that indicates a nontrivial end-of-line
convention for encoding a file. Usually, lines of text are separated
by @dfn{newline characters} in a file, but two other conventions are
-sometimes used. The MS-DOS convention uses a carriage-return
+sometimes used. The MS-DOS convention uses a carriage return
character followed by a linefeed character; when editing such
files, the colon changes to either a backslash (@samp{\}) or
@samp{(DOS)}, depending on the operating system. Another convention,
-employed by older Macintosh systems, uses a carriage-return
+employed by older Macintosh systems, uses a carriage return
character instead of a newline; when editing such files, the colon
changes to either a forward slash (@samp{/}) or @samp{(Mac)}. On some
systems, Emacs displays @samp{(Unix)} instead of the colon for files