in nano.1 and nano.texi, eliminate references to the now removed

-D/--dos and -M/--mac command line options

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2022 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index a4167ae6752ab3b061c17627954a9c07db23bfe5..d63653d01f2be8c2ed96345993b913225fa5f38b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -295,6 +295,9 @@ CVS code -
 - README.CVS:
        - Mention the requirement for glib 2.x on systems lacking
          v?snprintf(), and add minor formatting changes.
+- nano.1, nano.texi
+       - Eliminate references to the now removed -D/--dos and -M/--mac
+         command line options. (DLR)
 - m4/glib-2.0.m4:
        - New file imported from glib 2.4.7.  This is needed to detect
          glib 2.x on systems that may not have it installed. (DLR,

diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 7536675f130d41dc5850401f51c3e5c5d9dec2f1..2c72f508d18550f96f64592982c738752bf0d860 100644 (file)
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -46,9 +46,6 @@ line.
 When saving a file, back up the previous version of it to the current
 filename suffixed with a ~.
 .TP
-.B \-D (\-\-dos)
-Write file in DOS format.
-.TP
 .B \-E \fIdir\fP (\-\-backupdir=\fIdir\fP)
 Set the directory where \fBnano\fP puts the backup files if file backups
 are enabled.
@@ -69,9 +66,6 @@ or
 .IR ~/.nanorc ,
 if nanorc support is available.
 .TP
-.B \-M (\-\-mac)
-Write file in Mac format.
-.TP
 .B \-N (\-\-noconvert)
 Disable automatic conversion of files from DOS/Mac format.
 .TP

diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 5699b8a67a238f81ed42f8afdbfbd70197c0f006..ba7997395ccc1ec0af62e32ec219916eea075edf 100644 (file)
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -118,9 +118,6 @@ line.
 When saving a file, back up the previous version of it to the current
 filename suffixed with a ~.
 
-@item -D, --dos
-Write file in DOS format.
-
 @item -E, --backupdir=[dir]
 Set the directory where @code{nano} puts the backup files if file
 backups are enabled.
@@ -132,9 +129,6 @@ Enable multiple file buffers, if available.
 Don't look at SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is
 available.
 
-@item -M, --mac
-Write file in Mac format.
-
 @item -N, --noconvert
 Do not convert files from DOS/Mac format.
 
@@ -349,7 +343,7 @@ The following global toggles are available:
 toggles the -B (@code{--backup}) command line flag.
 
 @item DOS Format Toggle (Meta-D)
-toggles the -D (@code{--dos}) command line flag.
+toggles writing the file in DOS format.
 
 @item Multiple Files Toggle (Meta-F)
 toggles the -F (@code{--multibuffer}) command line flag.
@@ -370,7 +364,7 @@ toggles the -w (@code{--nowrap}) command line flag.
 toggles the -m (@code{--mouse}) command line flag.
 
 @item Mac Format Toggle (Meta-O)
-toggles the -M (@code{--mac}) command line flag.
+toggles writing the file in Mac format.
 
 @item Smooth Scrolling Toggle (Meta-S)
 toggles the -S (@code{--smooth}) command line flag.