diff options
| -rw-r--r-- | winsup/doc/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/doc/Makefile.in | 2 | ||||
| -rwxr-xr-x | winsup/doc/configure | 35 | ||||
| -rw-r--r-- | winsup/doc/configure.in | 2 | ||||
| -rw-r--r-- | winsup/doc/cygwin-api.in.sgml | 11 | ||||
| -rw-r--r-- | winsup/doc/cygwin-ug-net.in.sgml | 20 | ||||
| -rw-r--r-- | winsup/doc/cygwin-ug.in.sgml | 20 | ||||
| -rw-r--r-- | winsup/doc/doctool.c | 2 | ||||
| -rw-r--r-- | winsup/doc/gcc.sgml | 6 | ||||
| -rw-r--r-- | winsup/doc/history.texinfo | 2 | ||||
| -rw-r--r-- | winsup/doc/how-using.texinfo | 2 | ||||
| -rw-r--r-- | winsup/doc/install.texinfo | 2 | ||||
| -rw-r--r-- | winsup/doc/legal.sgml | 12 | ||||
| -rw-r--r-- | winsup/doc/overview.sgml | 13 | ||||
| -rw-r--r-- | winsup/doc/overview2.sgml | 5 | ||||
| -rw-r--r-- | winsup/doc/pathnames.sgml | 74 | ||||
| -rw-r--r-- | winsup/doc/setup-net.sgml | 131 | ||||
| -rw-r--r-- | winsup/doc/setup2.sgml | 210 | ||||
| -rw-r--r-- | winsup/doc/textbinary.sgml | 2 |
19 files changed, 122 insertions, 434 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog index b53588ffc..46c13bad4 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,3 +1,8 @@ +2001-12-03 Christopher Faylor <cgf@redhat.com> + + Cleanup copyrights and Cygnus'isms throughout. + * setup.sgml: Nuke ancient instructions. + Tue Oct 16 18:02:00 2001 Corinna Vinschen <corinna@vinschen.de> * pathnames.sgml: Cleanup raw device text to be more coherent. diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in index 9e9a7266b..198e9ca3f 100644 --- a/winsup/doc/Makefile.in +++ b/winsup/doc/Makefile.in @@ -1,5 +1,5 @@ # -*- Makefile -*- for winsup/doc -# Copyright (c) 1998-2000 Cygnus Solutions. +# Copyright (c) 1998-2000,2001 Red Hat, Inc. # # This file is part of Cygwin. # diff --git a/winsup/doc/configure b/winsup/doc/configure index 09d5a070c..eea87df57 100755 --- a/winsup/doc/configure +++ b/winsup/doc/configure @@ -28,7 +28,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -143,7 +142,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -314,11 +312,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -484,16 +477,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -582,7 +571,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:586: checking host system type" >&5 +echo "configure:575: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -603,7 +592,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:607: checking target system type" >&5 +echo "configure:596: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -621,7 +610,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:625: checking build system type" >&5 +echo "configure:614: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -653,7 +642,7 @@ fi # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:657: checking for $ac_word" >&5 +echo "configure:646: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -685,7 +674,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:689: checking for $ac_word" >&5 +echo "configure:678: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -721,7 +710,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:725: checking for $ac_word" >&5 +echo "configure:714: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -775,7 +764,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:779: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:768: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/winsup/doc/configure.in b/winsup/doc/configure.in index a51a474a9..503777724 100644 --- a/winsup/doc/configure.in +++ b/winsup/doc/configure.in @@ -1,5 +1,5 @@ dnl Autoconf configure script for winsup/regexp -dnl Copyright 1997 Cygnus Solutions. +dnl Copyright 1997,1998,1999,2000,2001 Red Hat, Inc. dnl dnl This file is part of Cygwin. dnl diff --git a/winsup/doc/cygwin-api.in.sgml b/winsup/doc/cygwin-api.in.sgml index 13d7f8c2f..06baf5247 100644 --- a/winsup/doc/cygwin-api.in.sgml +++ b/winsup/doc/cygwin-api.in.sgml @@ -1,13 +1,12 @@ <!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [ - <!ENTITY cygnus-copyright "<YEAR>1998</YEAR><HOLDER>Cygnus - Solutions</HOLDER>"> + <!ENTITY cygnus-copyright "<YEAR>1998</YEAR><HOLDER>Red Hat, Inc.</HOLDER>"> <!ENTITY cygnus-code-copyright " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Copyright (C) 1998 Cygnus Solutions. +Copyright (C) 1998,2001 Red Hat, Inc. This is copyrighted software that may only be reproduced, modified, or distributed -under license from Cygnus Solutions. +under license from Red Hat, Inc. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "> ]> @@ -34,13 +33,13 @@ under license from Cygnus Solutions. <revision> <revnumber>0.0</revnumber> <date>1998-08-31</date> - <authorinitials>dj@cygnus.com</authorinitials> + <authorinitials>dj</authorinitials> <revremark>Initial revision</revremark> </revision> <revision> <revnumber>0.5.0</revnumber> <date>1998-12-17</date> - <authorinitials>noer@cygnus.com</authorinitials> + <authorinitials>noer</authorinitials> <revremark>Add pthread, sem calls. Change revnumber to three-part number: Cygwin API major, Cygwin API minor, Doc rev number. Starts out at 0.5.0.</revremark> diff --git a/winsup/doc/cygwin-ug-net.in.sgml b/winsup/doc/cygwin-ug-net.in.sgml index 633689631..41e876f22 100644 --- a/winsup/doc/cygwin-ug-net.in.sgml +++ b/winsup/doc/cygwin-ug-net.in.sgml @@ -1,14 +1,14 @@ <!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [ <!ENTITY cygnus-copyright - "<YEAR>1999</YEAR> - <HOLDER>Cygnus Solutions</HOLDER>"> + "<YEAR>1999,2000,2001</YEAR> + <HOLDER>Red Hat, Inc.</HOLDER>"> <!ENTITY cygnus-code-copyright " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Copyright (C) 1998, 1999 Cygnus Solutions. +Copyright (C) 1998, 1999,2000,2001 Red Hat, Inc. This is copyrighted software that may only be reproduced, modified, or distributed -under license from Cygnus Solutions. +under license from Red Hat, Inc. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "> ]> @@ -16,10 +16,18 @@ under license from Cygnus Solutions. <book id="cygwin-ug-net"> <bookinfo> - <date>1999-02-08</date> + <date>2001-22-03</date> <title>Cygwin User's Guide</title> <authorgroup> <author> + <firstname>Corinna</firstname> + <surname>Vinschen</surname> + </author> + <author> + <firstname>Christopher</firstname> + <surname>Faylor</surname> + </author> + <author> <firstname>DJ</firstname> <surname>Delorie</surname> </author> @@ -39,7 +47,7 @@ DOCTOOL-INSERT-legal <revision> <revnumber>0.0</revnumber> <date>1998-10-06</date> - <authorinitials>noer@cygnus.com</authorinitials> + <authorinitials>noer</authorinitials> <revremark>Initial revision</revremark> </revision> <revision> diff --git a/winsup/doc/cygwin-ug.in.sgml b/winsup/doc/cygwin-ug.in.sgml index 3a7371a88..91054f324 100644 --- a/winsup/doc/cygwin-ug.in.sgml +++ b/winsup/doc/cygwin-ug.in.sgml @@ -1,13 +1,13 @@ <!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [ - <!ENTITY cygnus-copyright "<YEAR>1999</YEAR> - <HOLDER>Cygnus Solutions</HOLDER>"> + <!ENTITY cygnus-copyright "<YEAR>1999,2000,2001</YEAR> + <HOLDER>Red Hat, Inc.</HOLDER>"> <!ENTITY cygnus-code-copyright " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Copyright (C) 1998, 1999 Cygnus Solutions. +Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc. This is copyrighted software that may only be reproduced, modified, or distributed -under license from Cygnus Solutions. +under license from Red Hat, Inc. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "> ]> @@ -15,10 +15,18 @@ under license from Cygnus Solutions. <book id="cygwin-ug"> <bookinfo> - <date>1998-01-28</date> + <date>2001-22-03</date> <title>Cygwin User's Guide</title> <authorgroup> <author> + <firstname>Corinna</firstname> + <surname>Vinschen</surname> + </author> + <author> + <firstname>Christopher</firstname> + <surname>Faylor</surname> + </author> + <author> <firstname>DJ</firstname> <surname>Delorie</surname> </author> @@ -38,7 +46,7 @@ DOCTOOL-INSERT-legal <revision> <revnumber>0.0</revnumber> <date>1998-08-31</date> - <authorinitials>dj@cygnus.com</authorinitials> + <authorinitials>dj</authorinitials> <revremark>Initial revision</revremark> </revision> <revision> diff --git a/winsup/doc/doctool.c b/winsup/doc/doctool.c index 26e76669d..ae034f345 100644 --- a/winsup/doc/doctool.c +++ b/winsup/doc/doctool.c @@ -1,6 +1,6 @@ /* doctool.c - Copyright 1998 Cygnus Solutions. + Copyright 1998,1999,2000,2001 Red Hat, Inc. This file is part of Cygwin. diff --git a/winsup/doc/gcc.sgml b/winsup/doc/gcc.sgml index d13bba116..238babfa3 100644 --- a/winsup/doc/gcc.sgml +++ b/winsup/doc/gcc.sgml @@ -9,11 +9,11 @@ options. Here's a simple example:</para> <example> <title>Building Hello World with GCC</title> <screen> -<prompt>C:\cygnus\></prompt> <userinput>gcc hello.c -o hello.exe</userinput> -<prompt>C:\cygnus\></prompt> <userinput>hello.exe</userinput> +<prompt>C:\></prompt> <userinput>gcc hello.c -o hello.exe</userinput> +<prompt>C:\></prompt> <userinput>hello.exe</userinput> Hello, World -<prompt>C:\cygnus\></prompt> +<prompt>C:\></prompt> </screen> </example> diff --git a/winsup/doc/history.texinfo b/winsup/doc/history.texinfo index f13be55fc..8856a70b8 100644 --- a/winsup/doc/history.texinfo +++ b/winsup/doc/history.texinfo @@ -298,7 +298,7 @@ Under NT only, utilities mkpasswd and mkgroup can generate a valid /etc/passwd and /etc/group. Earlier releases stored mount points in the registry under -"Cygnus Support". This changed to "Cygnus Solutions" starting +"Cygnus Support". This changed to "Red Hat, Inc." starting with beta 18. Either use a registry editor (regedit under NT) to rename the old entry or just redo your mount points and the cygwin.dll will automatically create the new one for you. diff --git a/winsup/doc/how-using.texinfo b/winsup/doc/how-using.texinfo index 15b092537..94504d05c 100644 --- a/winsup/doc/how-using.texinfo +++ b/winsup/doc/how-using.texinfo @@ -461,7 +461,7 @@ you should have better luck. If you are trying to umount '/' and are getting this message, you may need to run @code{regedit.exe} and change the "native" key for the '/' mount in one of the mount points kept under -HKEY_CURRENT_USER/Software/Cygnus Solutions/CYGWIN.DLL setup/<version> +HKEY_CURRENT_USER/Software/Red Hat, Inc./CYGWIN.DLL setup/<version> where <version> is the latest registry version associated with the Cygwin library. diff --git a/winsup/doc/install.texinfo b/winsup/doc/install.texinfo index 5e8c32787..39934f83c 100644 --- a/winsup/doc/install.texinfo +++ b/winsup/doc/install.texinfo @@ -218,7 +218,7 @@ manually: @itemize @bullet @item Cygwin shortcuts on the Desktop and Start Menu -@item The registry tree @samp{Software\Cygnus Solutions} under +@item The registry tree @samp{Software\Red Hat, Inc.} under @code{HKEY_LOCAL_MACHINE} and/or @code{HKEY_CURRENT_USER}. @item Anything under the Cygwin root folder, @samp{C:\cygwin} by diff --git a/winsup/doc/legal.sgml b/winsup/doc/legal.sgml index 721899c46..1190ecce1 100644 --- a/winsup/doc/legal.sgml +++ b/winsup/doc/legal.sgml @@ -1,11 +1,11 @@ <LegalNotice id="legal"> -<Para>Copyright © 1998,1999 Cygnus Solutions.</Para> +<Para>Copyright © 1998,1999,2000,2001 Red Hat, Inc.</Para> <!-- -<Para>GNUPro™, the GNUPro™ logo, and the Cygnus Solutions -logo are trademarks of Cygnus Solutions. All other brand and product +<Para>GNUPro™, the GNUPro™ logo, and the Red Hat +logo are trademarks of Red Hat, Inc. All other brand and product names are trademarks of their respective owners.</Para> <Para>Permission is granted to make and distribute verbatim copies of @@ -23,10 +23,8 @@ for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation.</Para> -<Para>This documentation has been prepared by Cygnus Solutions -Technical Publications; to contact the Cygnus Solutions Technical -Publications staff, email: <Email>doc@cygnus.com</Email>.</Para> - +<Para>This documentation has been prepared by Red Hat, Inc. +Technical Publications.</para> --> </LegalNotice> diff --git a/winsup/doc/overview.sgml b/winsup/doc/overview.sgml index 4b48094aa..a69fcb55a 100644 --- a/winsup/doc/overview.sgml +++ b/winsup/doc/overview.sgml @@ -24,17 +24,18 @@ from the bash shell (provided) or from the command.com.</para> <para>Yes. Parts are GNU software (gcc, gas, ld, etc...), parts are covered by the standard X11 license, some of it is public domain, -some of it was written by Cygnus and placed under the GPL. None of it +some of it was written by Red Hat and placed under the GPL. None of it is shareware. You don't have to pay anyone to use it but you should be sure to read the copyright section of the FAQ more more information on how the GNU General Public License may affect your use of these tools. If you intend to port a proprietary application using the Cygwin library, you may want the Cygwin proprietary-use license. -For more information about the -proprietary-use license, please contact sales@cygnus.com. Customers of -the native Win32 GNUPro should feel free to submit bug reports and ask -questions through the normal channels. All other questions should be -sent to the project mailing list cygwin@sourceware.cygnus.com.</para> +For more information about the proprietary-use license, please go to +<ulink URL="http://cygwin.com/cygwin-redhat.com">http://cygwin.com/cygwin-redhat.com +</ulink>. Customers of the native Win32 GNUPro should feel free to submit bug +reports and ask questions through the normal channels. All other +questions should be sent to the project mailing list +<email>cygwin@cygwin.com</email>.</para> </sect1> diff --git a/winsup/doc/overview2.sgml b/winsup/doc/overview2.sgml index 4c8595dd5..755b4c42c 100644 --- a/winsup/doc/overview2.sgml +++ b/winsup/doc/overview2.sgml @@ -164,7 +164,7 @@ backslashes) and CIFS paths (//server/share or \\server\share) as well.</para> <sect2 id="ov-hi-textvsbinary"><title>Text Mode vs. Binary Mode</title> <para>Interoperability with other Win32 programs such as text editors was -critical to the success of the port of the development tools. Most Cygnus +critical to the success of the port of the development tools. Most Red Hat customers upgrading from the older DOS-hosted toolchains expected the new Win32-hosted ones to continue to work with their old development sources.</para> @@ -184,8 +184,7 @@ set to override this behavior.</para> </sect2> <sect2 id="ov-hi-ansiclib"><title>ANSI C Library</title> -<para>We chose to include -Cygnus' own existing ANSI C library +<para>We chose to include Red Hat's own existing ANSI C library "newlib" as part of the library, rather than write all of the lib C and math calls from scratch. Newlib is a BSD-derived ANSI C library, previously only used by cross-compilers for embedded systems diff --git a/winsup/doc/pathnames.sgml b/winsup/doc/pathnames.sgml index 8dd8dcb78..00b216e92 100644 --- a/winsup/doc/pathnames.sgml +++ b/winsup/doc/pathnames.sgml @@ -42,7 +42,7 @@ the appropriate priviledges (Administrator priviledges in Windows NT).</para> <para>The current user's table is located under -"HKEY_CURRENT_USER/Software/Cygnus Solutions/Cygwin/mounts +"HKEY_CURRENT_USER/Software/Red Hat, Inc./Cygwin/mounts v<version>" where <version> is the latest registry version associated with the Cygwin library (this version is not the same as the release @@ -70,10 +70,13 @@ to the current user.</para> <example> <title>Displaying the current set of mount points</title> <screen> -<prompt>c:\cygnus\></prompt> <userinput>mount</userinput> -Device Directory Type Flags -D: /d user textmode -C: / system textmode +<prompt>c:\></prompt> <userinput>mount</userinput> +f:\cygwin\bin on /usr/bin type system (binmode) +f:\cygwin\lib on /usr/lib type system (binmode) +f:\cygwin on / type system (binmode) +e:\src on /usr/src type system (binmode) +c: on /cygdrive/c type user (binmode,noumount) +e: on /cygdrive/e type user (binmode,noumount) </screen> </example> @@ -102,43 +105,6 @@ information on text and binary modes.</para> </sect2> -<sect2><title>Cygwin Mount Table Strategies</title> - -<para>Which set of mounts is right for a given Cygwin user depends -largely on how closely you want to simulate a POSIX environment, -whether you mix Windows and Cygwin programs, and how many drive -letters you are using. If you want to be very POSIX-like (assuming -"CygwinRoot" is the top directory of your Cygwin distribution), you may -want to do something like this:</para> - -<example><title>POSIX-like mount setup</title> -<screen> -<prompt>C:\></prompt> <userinput>mount c:\Cygnus\CygwinRoot /</userinput> -<prompt>C:\></prompt> <userinput>mount c:\ /c</userinput> -<prompt>C:\></prompt> <userinput>mount d:\ /d</userinput> -<prompt>C:\></prompt> <userinput>mount e:\ /cdrom</userinput> -</screen> -</example> - -<para>However, if you mix Windows and Cygwin programs a lot, you might -want to create an "identity" mapping, so that conversions between the -two (see <Xref Linkend="cygpath">) can be eliminated:</para> - -<example><title>Identity mount setup</title> -<screen> -<prompt>C:\></prompt> <userinput>mount c:\ /</userinput> -<prompt>C:\></prompt> <userinput>mount d:\foo /foo</userinput> -<prompt>C:\></prompt> <userinput>mount d:\bar /bar</userinput> -<prompt>C:\></prompt> <userinput>mount e:\grill /grill</userinput> -</screen> -</example> - -<para>You'd have to repeat this for all top-level subdirectories on -all drives, but then you'd always have the top-level directories -available as the same names in both systems.</para> - -</sect2> - <sect2><title>Additional Path-related Information</title> <para>The <command>cygpath</command> program provides the ability to @@ -147,10 +113,10 @@ translate between Win32 and POSIX pathnames in shell scripts. See <para>The <EnVar>HOME</EnVar>, <EnVar>PATH</EnVar>, and <EnVar>LD_LIBRARY_PATH</EnVar> environment variables are automatically -converted from Win32 format to POSIX format (e.g. from -<filename>C:\cygnus\cygwin-b20\H-i586-cygwin32\bin</filename> to -<filename>/bin</filename>, if there was a mount from that Win32 path to -that POSIX path) when a Cygwin process first starts.</para> +converted from Win32 format to POSIX format (e.g. from +<filename>c:\cygwin\bin</filename> to <filename>/bin</filename>, if +there was a mount from that Win32 path to that POSIX path) when a Cygwin +process first starts.</para> <para>Symbolic links can also be used to map Win32 pathnames to POSIX. For example, the command @@ -339,11 +305,11 @@ does not. In the same situation the function call <filename>filename.exe</filename>. The two files can be distinguished by examining their inodes, as demonstrated below. <screen> -<prompt>C:\Cygnus\></prompt> <userinput>ls * </userinput> +<prompt>C:\></prompt> <userinput>ls * </userinput> a a.exe b.exe -<prompt>C:\Cygnus\></prompt> <userinput>ls -i a a.exe</userinput> +<prompt>C:\></prompt> <userinput>ls -i a a.exe</userinput> 445885548 a 435996602 a.exe -<prompt>C:\Cygnus\></prompt> <userinput>ls -i b b.exe</userinput> +<prompt>C:\></prompt> <userinput>ls -i b b.exe</userinput> 432961010 b 432961010 b.exe </screen> If a shell script <filename>myprog</filename> and a program @@ -381,13 +347,13 @@ In the following example compare the behaviors of the bash built-in <example><title> Using @pathname</title> <screen> -<prompt>/Cygnus$</prompt> <userinput>echo 'This is "a long" line' > mylist</userinput> -<prompt>/Cygnus$</prompt> <userinput>echo @mylist</userinput> +<prompt>bash$</prompt> <userinput>echo 'This is "a long" line' > mylist</userinput> +<prompt>bash$</prompt> <userinput>echo @mylist</userinput> @mylist -<prompt>/Cygnus$</prompt> <userinput>/bin/echo @mylist</userinput> +<prompt>bash$</prompt> <userinput>/bin/echo @mylist</userinput> This is a long line -<prompt>/Cygnus$</prompt> <userinput>rm mylist</userinput> -<prompt>/Cygnus$</prompt> <userinput>/bin/echo @mylist</userinput> +<prompt>bash$</prompt> <userinput>rm mylist</userinput> +<prompt>bash$</prompt> <userinput>/bin/echo @mylist</userinput> @mylist </screen> </example> diff --git a/winsup/doc/setup-net.sgml b/winsup/doc/setup-net.sgml index d6719e655..cc40f312b 100644 --- a/winsup/doc/setup-net.sgml +++ b/winsup/doc/setup-net.sgml @@ -1,131 +1,14 @@ <chapter id="setup-net"><title>Setting Up Cygwin</title> -<sect1><title>Cygwin Contents</title> - -<para>The following packages are included in the full release:</para> - -<para>Development tools: binutils, bison, byacc, dejagnu, diff, -expect, flex, gas, gcc, gdb, itcl, ld, libstdc++, make, patch, tcl, -tix, tk</para> - -<para>User tools: ash, bash, bzip2, diff, fileutils, findutils, gawk, -grep, gzip, less, m4, sed, shellutils, tar, textutils, time</para> - -<para>The user tools release only contains the user tools.</para> - -<para>Full source code is available for these tools.</para> - -</sect1> -<sect1 id="installing-binaries"><title>Installing the binary release</title> - -<para>Important! Be sure to remove any older versions of the Cygwin -tools from your <EnVar>PATH</EnVar> environment variable so you do -not execute them by mistake.</para> - -<para>Connect to one of the ftp servers listed in -<ulink URL="http://sourceware.cygnus.com/cygwin/mirrors.html"> -http://sourceware.cygnus.com/cygwin/mirrors.html</ulink> and -<command>cd</command> to the directory containing the latest release. -</para> - -<para>If you want the development tools and the programs necessary to -run the GNU configure mechanism, you should download the full binary -release called <filename>full.exe</filename>. If you only care -about the user tools listed above, download -<filename>usertools.exe</filename> instead.</para> - -<para>If you have an unreliable connection, download the appropriate -binary in smaller chunks instead. For the split full installer, get -the files in the `full-split' subdirectory. Once downloaded, -combine the split files at the command prompt by doing a:</para> - -<screen> -<prompt>C:\Cygnus\></prompt><userinput>copy /b xaa + xab + xac + ... + xak + xal full.exe</userinput> -<prompt>C:\Cygnus\></prompt><userinput>del xa*.*</userinput> -</screen> - -<para>A similar process can be used for the user tools.</para> - -<para>Once you have installed the executable on your system, run -it. First off, the installer will prompt you for a location to extract -the temporary files it needs to install the release on your -system. The default should be fine for most people.</para> - -<para>Next it will ask you to choose an install location. The default is -<filename><replaceable>system-drive</replaceable>:\cygnus\cygwin-b20</filename>. -Feel free to choose another location if you would prefer.</para> - -<para>Finally, it will ask you for the name of the Program Files -folder shortcut to add. By default, the installer will create a -`Cygwin B20' entry in a folder called `Cygnus Solutions'. When this -step is completed, it will install the tools and exit.</para> - -<para>If you should ever want to uninstall the tools, you may do so -via the "Add/Remove Programs" control panel.</para> - -<para> At this point you should be able to look under the start menu and -select "Cygwin Beta 20" (or whatever you named it). This will pop up a bash -shell with special environment variables set up for you. If you are running -Windows 95 or 98 and are faced with the error message "Out of environment -space", you need to increase the amount of environment space. Adding the -line <command>shell=C:\command.com /e:4096 /p</command> to the file -<filename>C:\CONFIG.SYS</filename> and then rebooting should do the trick if -<filename>C:</filename> is your system drive letter.</para> - -<para>If you want to install the sources follow the -instructions in the next section, else go directly to -<Xref LinkEnd="setup-dir"> to complete your system setup.</para> - -</sect1> -<sect1 id="installing-source"><title>Installing the source code</title> - -<para>Before downloading the source code corresponding to the release, -you should install the latest release of the tools (either the full -release or just the user tools).</para> - -<para>Create the directory that will house the source code. -<command>cd</command> there.</para> - -<para>Connect to one of the ftp servers listed above and -<command>cd</command> to the directory containing the latest release. -</para> - -<para>The source code is split into two units: user tools and development -tools. If you want the user tools source code, <command>cd</command> into -the <filename>user-src-split</filename> subdirectory. Download the files -there. If you want the development tools sources, <command>cd</command> -into the <filename>dev-src-split</filename> subdirectory. Download the -files there.</para> - -<para>Back in the Windows command shell, for the user tools -source:</para> - -<screen> -<prompt>C:\Cygnus\></prompt> <userinput>copy /b xba + xbb + xbc + xbd + xbe + xbf + xbg user-src.tar.bz2</userinput> -<prompt>C:\Cygnus\></prompt> <userinput>del xb*.*</userinput> -<prompt>C:\Cygnus\></prompt> <userinput>bunzip2 user-src.tar.bz2</userinput> -<prompt>C:\Cygnus\></prompt> <userinput>tar xvf user-src.tar</userinput> -</screen> - -<para>For the development tools source:</para> - -<screen> -<prompt>C:\Cygnus\></prompt> <userinput>copy /b xca + xcb + xcc + xcd + ... + xck + xcl dev-src.tar.bz2</userinput> -<prompt>C:\Cygnus\></prompt> <userinput>del xc*.*</userinput> -<prompt>C:\Cygnus\></prompt> <userinput>bunzip2 dev-src.tar.bz2</userinput> -<prompt>C:\Cygnus\></prompt> <userinput>tar xvf dev-src.tar</userinput> -</screen> - -<para>Both will expand into a directory called -<filename>src</filename>.</para> - -<para>Note: if you want the sources corresponding to everything in the -full.exe binary installer, you will need to download and expand both -the <filename>user-src.tar.bz2</filename> and -<filename>dev-src.tar.bz2</filename> source archives!</para> +<sect1><title>Internet Setup</title> +<para>To install the Cygwin net release, go to <ulink +URL="http://cygwin.com/">http://cygwin.com/</ulink> and click on <ulink +URL="http://cygwin.com/">"Install Cygwin Now!"</ulink>. This will +download a GUI installer called <command>setup.exe</command> which can +be run to download a complete cygwin installation via the internet. +Follow the instructions on each screen to install Cygwin.</para> </sect1> -DOCTOOL-INSERT-setup-dir DOCTOOL-INSERT-setup-env DOCTOOL-INSERT-ntsec DOCTOOL-INSERT-setup-files diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml index c3df06ec1..4b2ecf6ef 100644 --- a/winsup/doc/setup2.sgml +++ b/winsup/doc/setup2.sgml @@ -1,173 +1,22 @@ -<sect1 id="setup-dir"><title>Directory Structure</title> - -<para> -Cygwin knows how to emulate a standard UNIX directory structure, to -some extent. This is done through the use of mount tables that map -Win32 paths to POSIX ones. The mount table may be set up and modified -with the <command>mount</command> command. This section explains how -to properly organize the structure. </para> - -<para> When you set up the system you should decide where you want the -root to be mapped. Possible choices are the root of your Windows -system, such as -<filename>c:</filename> or a directory such as -<filename>c:\progra~1\root</filename>. -</para> - -<para> -Execute the following commands inside bash as it is difficult to -change the position of the root from the Windows command prompt. -Changing the mount points may invalidate <EnVar>PATH</EnVar>, if this -happens simply exit and relaunch bash. Create the directory if -needed, then <command>umount /</command> the current root and -<command>mount</command> it in its new place. You also have to decide if -you want to use text or binary mode. -</para> - -<para> -Next, create the traditional main UNIX directories, with -the following command (in some shells it is necessary to issue -separate <command>mkdir</command> commands, each with a single -argument). -</para> - -<screen> -<prompt>/$</prompt> <userinput>mkdir /tmp /bin /etc /var /usr</userinput> -</screen> - -<para> -Next we will initialize the content of these directories. -</para> - -<para> -You should make sure that you always have a valid -<filename>/tmp</filename> directory. If you want to avoid creating a -real <filename>/tmp</filename>, you can use the -<command>mount</command> utility to point <filename>/tmp</filename> to -another directory, such as <filename>c:\tmp</filename>, or create a -symbolic link <filename>/tmp</filename> to point to such a directory. -</para> - -<para> -The <filename>/bin</filename> directory should contain the shell -<filename>sh.exe</filename>. You have three choices. The first is to -copy this program from the Cygnus <filename>bin</filename> directory. -The second is to use <command>mount</command> to mount the Cygnus -<filename>bin</filename> directory to <filename>/bin</filename> (the -advantage of this approach is that your <envar>PATH</envar> will be -shorter inside bash). The third is to make <filename>/bin</filename> a -symbolic link to the Cygnus <filename>bin</filename> directory. -</para> - -<para> -Note that Cygwin comes with two shells: <command>bash.exe</command> and -<command>sh.exe</command>, which is based on <command>ash</command>. The -system is faster when <command>ash</command> is used as the -non-interactive shell. -The only functionality supported in <command>ash</command> is that -of the traditional <command>sh</command>. -In case of trouble with <command>ash</command> make -<command>sh.exe</command> point to <command>bash.exe</command>. -</para> - -<para> -We now turn to <filename>/etc</filename>. You may want to copy in it -the <filename>termcap</filename> file from the Cygnus -<filename>etc</filename> directory, although the defaults built into -the programs suffice for the normal console. You may also use -<command>mount</command> or create as symbolic link to the Cygnus -<filename>etc</filename>, just as for <filename>/bin</filename> -above. -</para> - -<para> Under Windows NT, if you want to create -<filename>/etc/passwd</filename> and <filename>/etc/group</filename> -(i.e. so that <command>whoami</command> works and -<command>ls -l</command> replaces the UID with a name) based on the accounts local to the machine, just do this: -</para> - -<screen> -<prompt>/$</prompt> <userinput>cd /etc</userinput> -<prompt>/etc$</prompt> <userinput>mkpasswd -l > /etc/passwd</userinput> -<prompt>/etc$</prompt> <userinput>mkgroup -l > /etc/group</userinput> -</screen> - -<para>If you are logging in based on an NT network domain, and want to -also create entries in <filename>/etc/passwd</filename> and -<filename>/etc/group</filename> based on all the accounts in the -domain, then after creating local entries do this: -</para> - -<screen> -<prompt>/$</prompt> <userinput>cd /etc</userinput> -<prompt>/etc$</prompt> <userinput>mkpasswd -d >> /etc/passwd</userinput> -<prompt>/etc$</prompt> <userinput>mkgroup -d >> /etc/group</userinput> -</screen> - -<para>Alternatively, to add only your account to the passwd file, -assuming your NT name is "my_ntusername", instead of the above -<command>mkpasswd</command> you should do: -</para> - -<screen> -<prompt>/$</prompt> <userinput>cd /etc</userinput> -<prompt>/etc$</prompt> <userinput>mkpasswd -d | grep my_ntusername >> /etc/passwd</userinput> -</screen> - - -<para> Future changes to your NT registry or network domain will NOT be reflected in -<filename>/etc/passwd</filename> or <filename>/etc/group </filename> after -this so you may want to regenerate these files periodically. Under Windows -9x, you can create and edit these files with a text editor. </para> - -<para> -The <command>who</command> command requires the -<filename>/var/run/utmp</filename> to exist. -Create it if you wish. -The system also logs information in <filename>/var/log/wtmp</filename>, -if it exists. -</para> - -<para> -The <filename>/usr</filename> directory is not used by the Cygwin -system but it is a standard place to install optional packages. -</para> - -<para> -You may also want to mount directories such as <filename>/a</filename> -and <filename>/d</filename> to refer to your local and network drives. -</para> - -<para> -You do not need to create <filename>/dev</filename> in order to set up -mounts for devices such as <filename>/dev/null</filename> as these -are already automatically simulated inside the Cygwin library. -</para> - -</sect1> - <sect1 id="setup-env"><title>Environment Variables</title> <para> -Before starting bash, you must set some environment variables, some of -which can also be set or modified inside bash. Cygnus provides you -with a .bat file where the most important ones are set before bash in +Before starting bash, you may set some environment variables. A .bat +file is provided where the most important ones are set before bash in launched. This is the safest way to launch bash initially. The .bat -file is installed by default in -<filename>\cygnus\cygwin-b20/cygnus.bat</filename> and pointed to in -the Start Menu. You can edit it to your liking. -</para> +file is installed in the root directory that you specified during setup +and pointed to in the Start Menu under the "Cygwin" option. You can +edit it this file your liking.</para> <para> -The <envar>CYGWIN</envar> variable is used to configure many global -settings for the Cygwin -runtime system. Initially you can leave <envar>CYGWIN</envar> unset -or set it to <literal>tty</literal> (e.g. to support job control with ^Z -etc...) using a syntax like this in the DOS shell, before launching bash. -</para> +The <envar>CYGWIN</envar> variable is used to configure many global +settings for the Cygwin runtime system. Initially you can leave +<envar>CYGWIN</envar> unset or set it to <literal>tty</literal> (e.g. +to support job control with ^Z etc...) using a syntax like this in the +DOS shell, before launching bash. </para> <screen> -<prompt>C:\Cygnus\></prompt> <userinput>set CYGWIN=tty notitle glob</userinput> +<prompt>C:\></prompt> <userinput>set CYGWIN=tty notitle glob</userinput> </screen> <para> @@ -177,10 +26,9 @@ to run. This environment variable is converted from Windows format (e.g. <filename>C:\WinNT\system32;C:\WinNT</filename>) to UNIX format (e.g., <filename>/WinNT/system32:/WinNT</filename>) when a Cygwin process first starts. -Set it so that it contains at least the Cygnus -<filename>bin</filename> directory -<filename>C:\cygnus\cygwin-b20\H-i586-cygwin32\bin</filename> before -launching bash. +Set it so that it contains at least the <filename>x:\cygwin\bin</filename> +directory where "<filename>x:\cygwin</filename> is the "root" of your +cygwin installation if you wish to use cygwin tools outside of bash. </para> <para> @@ -192,32 +40,16 @@ before launching bash. </para> <para> -<command>make</command> uses an environment variable -<envar>MAKE_MODE</envar> to decide if it uses -<filename>command.com</filename> or <filename>/bin/sh</filename> to -run command lines. If you are getting strange errors from -<command>make</command> about "/c not found", set -<envar>MAKE_MODE</envar> to <literal>UNIX</literal> at the command -prompt or in bash. -</para> - -<screen> -<prompt>C:\Cygnus\></prompt> <userinput>set MAKE_MODE=UNIX</userinput> - -<prompt>/Cygnus$</prompt> <userinput>export MAKE_MODE=UNIX</userinput> -</screen> - -<para> The <envar>TERM</envar> environment variable specifies your terminal -type. You can set it to <literal>cygwin</literal>. +type. It is automatically set to <literal>cygwin</literal> if you have +not set it to something else. </para> -<para>The <envar>LD_LIBRARY_PATH</envar> environment variable is -used by the Cygwin function <function>dlopen ()</function> as a list -of directories to search for .dll files to load. This environment -variable is converted from Windows format to UNIX format -when a Cygwin process first starts. -Most Cygwin applications do not make use of the +<para>The <envar>LD_LIBRARY_PATH</envar> environment variable is used by +the Cygwin function <function>dlopen ()</function> as a list of +directories to search for .dll files to load. This environment variable +is converted from Windows format to UNIX format when a Cygwin process +first starts. Most Cygwin applications do not make use of the <function>dlopen ()</function> call and do not need this variable. </para> diff --git a/winsup/doc/textbinary.sgml b/winsup/doc/textbinary.sgml index cf6fc1b36..a58bd0231 100644 --- a/winsup/doc/textbinary.sgml +++ b/winsup/doc/textbinary.sgml @@ -127,7 +127,7 @@ In the second case we rely on the DOS shell to redirect in binary mode. <para>UNIX programs that have been written for maximum portability will know the difference between text and binary files and act appropriately under Cygwin. For those programs, the text mode default -is a good choice. Programs included in official Cygnus distributions +is a good choice. Programs included in official Cygwin distributions should work well in the default mode. </para> <para>Text mode makes it much easier to mix files between Cygwin and |