https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=3476c8c868d95825f16710a6b893b62576f625de
commit 3476c8c868d95825f16710a6b893b62576f625de
Author: Corinna Vinschen <cori...@vinschen.de>
Date: Tue Dec 5 17:58:02 2017 +0100
cygwin: doc: cleanup cygutils info
Especially don't keep on about d2u and u2d. Dos2unix exists.
Signed-off-by: Corinna Vinschen <cori...@vinschen.de>
Diff:
---
winsup/doc/effectively.xml | 39 ++++++++-------------------------------
winsup/doc/faq-api.xml | 4 ++--
winsup/doc/intro.xml | 7 +++----
winsup/doc/textbinary.xml | 4 ++--
4 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/winsup/doc/effectively.xml b/winsup/doc/effectively.xml
index f0d6547..e6a394b 100644
--- a/winsup/doc/effectively.xml
+++ b/winsup/doc/effectively.xml
@@ -96,40 +96,16 @@ programs in your environment.
</sect2>
-<sect2 id="using-cygutils"><title>The cygutils package</title>
-
-<para>
-The optional <systemitem>cygutils</systemitem> package contains
-miscellaneous tools that are small enough to not require their own package.
-It is not included in a default Cygwin install; select it from the Utils
-category in <command>setup.exe</command>. Several of the
-<systemitem>cygutils</systemitem> tools are useful for interacting with
-Windows.</para>
-
-<para>
-One of the hassles of Unix-Windows interoperability is the different line
-endings on text files. As mentioned in <xref
linkend="using-textbinary"></xref>,
-Unix tools such as <command>tr</command> can convert between CRLF and LF
-endings, but <systemitem>cygutils</systemitem> provides several dedicated
programs:
-<command>conv</command>, <command>d2u</command>, <command>dos2unix</command>,
-<command>u2d</command>, and <command>unix2dos</command>. Use the
-<literal>--help</literal> switch for usage information.
-</para>
-</sect2>
-
-<sect2 id="using-shortcuts"><title>Creating shortcuts with cygutils</title>
+<sect2 id="using-shortcuts"><title>Creating shortcuts</title>
<para>
-Another problem area is between Unix-style links, which link one file
-to another, and Microsoft .lnk files, which provide a shortcut to a
-file. They seem similar at first glance but, in reality, are fairly
-different. By default, Cygwin does not create symlinks as .lnk files,
-but there's an option to do that, see <xref linkend="using-cygwinenv"></xref>.
+By default, Cygwin does not create symlinks as .lnk files, but there's an
+option to do that, see <xref linkend="using-cygwinenv"></xref>.
These symlink .lnk files are compatible with Windows-created .lnk files,
but they are still different. They do not include much of the information
that is available in a standard Microsoft shortcut, such as the working
directory, an icon, etc. The <systemitem>cygutils</systemitem>
package includes a <command>mkshortcut</command> utility for creating
-standard native Microsoft .lnk files.
+standard native Microsoft .lnk files from the command line.
</para>
<para>
@@ -144,11 +120,12 @@ Windows shortcuts.
</para>
</sect2>
-<sect2 id="using-printing"><title>Printing with cygutils</title>
+<sect2 id="using-printing"><title>Printing</title>
<para>
There are several options for printing from Cygwin, including the
-<command>lpr</command> found in <systemitem>cygutils</systemitem> (not to be
confused with the
-native Windows <command>lpr.exe</command>). The easiest way to use
<systemitem>cygutils</systemitem>'
+<command>lpr</command> found in <systemitem>cygutils-extra</systemitem>
+(not to be confused with the native Windows <command>lpr.exe</command>).
+The easiest way to use <systemitem>cygutils-extra</systemitem>'s
<command>lpr</command> is to specify a default device name in the
<envar>PRINTER</envar> environment variable. You may also specify a device
on the command line with the <literal>-d</literal> or <literal>-P</literal>
diff --git a/winsup/doc/faq-api.xml b/winsup/doc/faq-api.xml
index 993274a..6abbbc4 100644
--- a/winsup/doc/faq-api.xml
+++ b/winsup/doc/faq-api.xml
@@ -75,8 +75,8 @@ since it only slows down reading and writing files.
Additionally many
Windows applications can deal with POSIX \n line endings just fine
(unfortunate exception: Notepad). So we suggest to use binary mode
as much as possible and only convert files from or to DOS text mode
-using tools specifically created to do that job, for instance, d2u and
-u2d from the cygutils package.
+using tools specifically created to do that job, for instance, dos2unix and
+unix2dos from the dos2unix package.
</para>
<para>It is rather easy for the porter of a Unix package to fix the source
code by supplying the appropriate file processing mode switches to the
diff --git a/winsup/doc/intro.xml b/winsup/doc/intro.xml
index 5e96d8b..c683459 100644
--- a/winsup/doc/intro.xml
+++ b/winsup/doc/intro.xml
@@ -71,10 +71,9 @@
<para>
<ulink url="http://cygwin.com/cygwin-ug-net/using-utils.html"/>
</para>
- <para>The optional <package>cygutils</package> package also contains
- utilities that help with common problems, such as
- <command>dos2unix</command> and <command>unix2dos</command> for the
- CRLF issue.</para>
+ <para>The optional <package>cygutils</package> and
+ <package>cygutils-extra</package> packages also contain utilities that
+ help with common problems.</para>
</refsect1>
<refsect1>
<title>DOCUMENTATION</title>
diff --git a/winsup/doc/textbinary.xml b/winsup/doc/textbinary.xml
index dbc540a..447bc6f 100644
--- a/winsup/doc/textbinary.xml
+++ b/winsup/doc/textbinary.xml
@@ -98,8 +98,8 @@ handle binmode files just fine. A notable exception is the
mini-editor
and only produces output files with DOS CRLF lineendings.</para>
<para>You can convert files between CRLF and LF lineendings by using
-certain tools in the Cygwin distribution like <command>d2u</command> and
-<command>u2d</command> from the cygutils package. You can also specify
+certain tools in the Cygwin distribution like <command>dos2unix</command> and
+<command>unix2dos</command> from the dos2unix package. You can also specify
a directory in the mount table to be mounted in textmode so you can use
that directory for exchange purposes.</para>
