From 3476c8c868d95825f16710a6b893b62576f625de Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 5 Dec 2017 17:58:02 +0100 Subject: [PATCH] cygwin: doc: cleanup cygutils info Especially don't keep on about d2u and u2d. Dos2unix exists. Signed-off-by: Corinna Vinschen --- 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 f0d654715..e6a394b60 100644 --- a/winsup/doc/effectively.xml +++ b/winsup/doc/effectively.xml @@ -96,40 +96,16 @@ programs in your environment. -The cygutils package - +Creating shortcuts -The optional cygutils 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 setup.exe. Several of the -cygutils tools are useful for interacting with -Windows. - - -One of the hassles of Unix-Windows interoperability is the different line -endings on text files. As mentioned in , -Unix tools such as tr can convert between CRLF and LF -endings, but cygutils provides several dedicated programs: -conv, d2u, dos2unix, -u2d, and unix2dos. Use the ---help switch for usage information. - - - -Creating shortcuts with cygutils - -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 . +By default, Cygwin does not create symlinks as .lnk files, but there's an +option to do that, see . 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 cygutils package includes a mkshortcut utility for creating -standard native Microsoft .lnk files. +standard native Microsoft .lnk files from the command line. @@ -144,11 +120,12 @@ Windows shortcuts. -Printing with cygutils +Printing There are several options for printing from Cygwin, including the -lpr found in cygutils (not to be confused with the -native Windows lpr.exe). The easiest way to use cygutils' +lpr found in cygutils-extra +(not to be confused with the native Windows lpr.exe). +The easiest way to use cygutils-extra's lpr is to specify a default device name in the PRINTER environment variable. You may also specify a device on the command line with the -d or -P diff --git a/winsup/doc/faq-api.xml b/winsup/doc/faq-api.xml index 993274a33..6abbbc4b6 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. 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 5e96d8b5b..c68345979 100644 --- a/winsup/doc/intro.xml +++ b/winsup/doc/intro.xml @@ -71,10 +71,9 @@ - The optional cygutils package also contains - utilities that help with common problems, such as - dos2unix and unix2dos for the - CRLF issue. + The optional cygutils and + cygutils-extra packages also contain utilities that + help with common problems. DOCUMENTATION diff --git a/winsup/doc/textbinary.xml b/winsup/doc/textbinary.xml index dbc540aea..447bc6f99 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. You can convert files between CRLF and LF lineendings by using -certain tools in the Cygwin distribution like d2u and -u2d from the cygutils package. You can also specify +certain tools in the Cygwin distribution like dos2unix and +unix2dos 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.