aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/editing.txt
diff options
context:
space:
mode:
authorMichael Reed <m.reed@mykolab.com>2014-11-18 01:44:47 -0500
committerMichael Reed <m.reed@mykolab.com>2014-11-27 23:42:40 -0500
commitba1e2ce287752a1bd30d52f77493a5bb582c2349 (patch)
tree0e9041ec9f2b566d3aed97fa8bf03a43ecd09830 /runtime/doc/editing.txt
parent83a4c9d58ce9265fc5b18e1f4e289552a56e9a56 (diff)
downloadrneovim-ba1e2ce287752a1bd30d52f77493a5bb582c2349.tar.gz
rneovim-ba1e2ce287752a1bd30d52f77493a5bb582c2349.tar.bz2
rneovim-ba1e2ce287752a1bd30d52f77493a5bb582c2349.zip
Remove OS/2 references
Paul Slootman was removed from the top of os_unix.c as OS/2 is no longer supported, but is still credited in runtime/doc/intro.txt.
Diffstat (limited to 'runtime/doc/editing.txt')
-rw-r--r--runtime/doc/editing.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index f2f2bee79e..e4867e7a90 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -502,8 +502,8 @@ The 'fileformat' option sets the <EOL> style for a file:
"mac" <CR> Mac format *Mac-format*
When reading a file, the mentioned characters are interpreted as the <EOL>.
-In DOS format (default for MS-DOS, OS/2 and Win32), <CR><NL> and <NL> are both
-interpreted as the <EOL>. Note that when writing the file in DOS format,
+In DOS format (default for MS-DOS and Win32), <CR><NL> and <NL> are both
+interpreted as the <EOL>. Note that when writing the file in DOS format,
<CR> characters will be added for each single <NL>. Also see |file-read|.
When writing a file, the mentioned characters are used for <EOL>. For DOS
@@ -1011,11 +1011,11 @@ lost the original file.
*DOS-format-write*
If the 'fileformat' is "dos", <CR> <NL> is used for <EOL>. This is default
-for MS-DOS, Win32 and OS/2. On other systems the message "[dos format]" is
-shown to remind you that an unusual <EOL> was used.
+for MS-DOS and Win32. On other systems the message "[dos format]" is shown to
+remind you that an unusual <EOL> was used.
*Unix-format-write*
-If the 'fileformat' is "unix", <NL> is used for <EOL>. On MS-DOS, Win32 and
-OS/2 the message "[unix format]" is shown.
+If the 'fileformat' is "unix", <NL> is used for <EOL>. On MS-DOS and Win32
+the message "[unix format]" is shown.
*Mac-format-write*
If the 'fileformat' is "mac", <CR> is used for <EOL>. On non-Mac systems the
message "[mac format]" is shown.