2004-06-13 Joshua Daniel Franklin <joshuadfranklin@yahoo.com>

	* faq.texinfo: Move outdated calls.texinfo to readme.texinfo.
	* how-api.texinfo: Fix typos.
	* how-programming.texinfo: Fix typos.
	* how-resources.texinfo: Fix typos.
	* how-using.texinfo: Fix typos.
	* install.texinfo: Fix typos.
	* readme.texinfo: Move outdated calls.texinfo to readme.texinfo.

8 files changed, 60 insertions, 41 deletions

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index c798c13c2..2af48e543 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-13  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
+
+	* faq.texinfo: Move outdated calls.texinfo to readme.texinfo.
+	* how-api.texinfo: Fix typos.
+	* how-programming.texinfo: Fix typos.
+	* how-resources.texinfo: Fix typos.
+	* how-using.texinfo: Fix typos.
+	* install.texinfo: Fix typos.
+	* readme.texinfo: Move outdated calls.texinfo to readme.texinfo.
+
 2004-05-21  Brian Ford  <ford@vss.fsi.com>
 
 	* pathnames.sgml: Remove /dev/kmem from the supported POSIX
@@ -329,4 +339,3 @@ Tue May  3  0:25:00 2000  Corinna Vinschen <corinna@vinschen.de>
         the changes in release 1.1.
         * setup.sgml: Include ntsec.
         * setup-net.sgml: Ditto.
-
diff --git a/winsup/doc/faq.texinfo b/winsup/doc/faq.texinfo
index 9a9540621..4a415f006 100644
--- a/winsup/doc/faq.texinfo
+++ b/winsup/doc/faq.texinfo
@@ -8,7 +8,6 @@
 
 @include what.texinfo
 @include install.texinfo
-@include calls.texinfo
 @include how.texinfo
 @include relnotes.texinfo
 @include history.texinfo
diff --git a/winsup/doc/how-api.texinfo b/winsup/doc/how-api.texinfo
index 3ae60bbcb..e95d1a8ef 100644
--- a/winsup/doc/how-api.texinfo
+++ b/winsup/doc/how-api.texinfo
@@ -11,11 +11,11 @@ Windows with no changes at the source level.
 
 The C library is in a DLL, which makes basic applications quite small.
 And it allows relatively easy upgrades to the Win32/Unix translation
-layer, providing that dll changes stay backward-compatible.
+layer, providing that DLL changes stay backward-compatible.
 
 For a good overview of Cygwin, you may want to read the paper on Cygwin
 published by the Usenix Association in conjunction with the 2d Usenix NT
-Symposium in August 1998.  It is available in html format on the project
+Symposium in August 1998.  It is available in HTML format on the project
 WWW site.
 
 @subsection Are development snapshots for the Cygwin library available?
@@ -43,14 +43,14 @@ specially.  A \n (new line) written to the file will prepend a \r
 (carriage return) so that if you `printf("Hello\n") you in fact get
 "Hello\r\n".  Upon reading this combination, the \r is removed and the
 number of bytes returned by the read is 1 less than was actually read.
-This tends to confuse programs dependant on ftell() and fseek().  A
+This tends to confuse programs dependent on ftell() and fseek().  A
 Ctrl-Z encountered while reading a file sets the End Of File flags even
 though it truly isn't the end of file.
 
 One of Cygwin's goals is to make it possible to easily mix Cygwin-ported
 Unix programs with generic Windows programs.  As a result, Cygwin opens
 files in text mode as is normal under Windows.  In the accompanying
-tools, tools that deal with binaries (e.g. objdump) operate in unix
+tools, tools that deal with binaries (e.g. objdump) operate in Unix
 binary mode and tools that deal with text files (e.g. bash) operate in
 text mode.
 
@@ -110,7 +110,7 @@ Parent initializes a space in the Cygwin process table for child.
 Parent creates child suspended using Win32 CreateProcess call, giving
 the same path it was invoked with itself.  Parent calls setjmp to save
 its own context and then sets a pointer to this in the Cygwin shared
-memory area (shared among all Cygwin tasks).  Parent fills in the childs
+memory area (shared among all Cygwin tasks).  Parent fills in the child's
 .data and .bss subsections by copying from its own address space into
 the suspended child's address space.  Parent then starts the child.
 Parent waits on mutex for child to get to safe point.  Child starts and
@@ -167,7 +167,7 @@ the environment variable CYGWIN.
 
 @subsection Why do some files, which are not executables have the 'x' type.
 
-When working out the unix-style attribute bits on a file, the library
+When working out the Unix-style attribute bits on a file, the library
 has to fill out some information not provided by the WIN32 API.  
 
 It guesses that files ending in .exe and .bat are executable, as are
@@ -181,7 +181,7 @@ running as admin while ordinary users are logged in, or if
 you have a user logged in remotely while another user is logged
 into the console, one cygwin client can trick another into
 running code for it.  In this way one user may gain the
-priveledge of another cygwin program running on the machine.
+privilege of another cygwin program running on the machine.
 This is because cygwin has shared state that is accessible by 
 all processes.
 
@@ -199,9 +199,9 @@ There are differences between the semantics of functions with the same
 name under the API.
 
 E.g., the select system call on Unix can wait on a standard file handles
-and handles to sockets.  The select call in winsock can only wait on
+and handles to sockets.  The select call in Winsock can only wait on
 sockets.  Because of this, cygwin.dll does a lot of nasty stuff behind
-the scenes, trying to persuade various winsock/win32 functions to do what
+the scenes, trying to persuade various Winsock/win32 functions to do what
 a Unix select would do.
 
 If you are porting an application which already uses Winsock, then
@@ -210,7 +210,7 @@ using the net support in Cygwin is wrong.
 But you can still use native Winsock, and use Cygwin.  The functions
 which cygwin.dll exports are called 'cygwin_<name>'.  There
 are a load of defines which map the standard Unix names to the names
-exported by the dll -- check out include/netdb.h:
+exported by the DLL-- check out include/netdb.h:
 
 @example
 ..etc..
@@ -227,7 +227,7 @@ void		cygwin_setrpcent (int);
 
 The idea is that you'll get the Unix->Cygwin mapping if you include
 the standard Unix header files.  If you use this, you won't need to
-link with libwinsock.a - all the net stuff is inside the dll.
+link with libwinsock.a - all the net stuff is inside the DLL.
 
 The mywinsock.h file is a standard winsock.h which has been hacked to
 remove the bits which conflict with the standard Unix API, or are
@@ -249,15 +249,23 @@ libwsock32.a.
 
 @subsection What version numbers are associated with Cygwin?
 
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-There is a cygwin.dll major version number that gets incremented
-every time we make a new Cygwin release available.  This
-corresponds to the name of the release (e.g. beta 19's major
-number is "19").  There is also a cygwin.dll minor version number.  If
-we release an update of the library for an existing release, the minor
-number would be incremented.
+Cygwin versioning is relatively complicated because of its status as a
+shared library.  First of all, since October 1998 every Cygwin DLL has
+been named @code{cygwin1.dll} and has a 1 in the release name.
+Additionally, there are DLL major and minor numbers that correspond to
+the name of the release, and a release number. In other words,
+cygwin-1.5.10-2 is @code{cygwin1.dll}, major version 5, minor version
+10, release 2.
+
+The @code{cygwin1.dll} major version number gets incremented only when a
+change is made that makes existing software incompatible. For example,
+the first major version 5 release, cygwin-1.5.0-1, added 64-bit file I/O
+operations, which required many libraries to be recompiled and relinked.
+The minor version changes every time we make a new backward compatible
+Cygwin release available.  There is also a @code{cygwin1.dll} release
+version number.  The release number is only incremented if we update an
+existing release in a way that does not effect the DLL (like a missing
+header file).
 
 There are also Cygwin API major and minor numbers.  The major number
 tracks important non-backward-compatible interface changes to the API.
@@ -266,13 +274,14 @@ with the latest DLL.  The minor number tracks significant API additions
 or changes that will not break older executables but may be required by
 newly compiled ones.
 
-Then there is a shared memory region compatibity version number.  It is
+Then there is a shared memory region compatibility version number.  It is
 incremented when incompatible changes are made to the shared memory
-region or to any named shared mutexes, semaphores, etc.
-
-Finally there is a mount point registry version number which keeps track
+region or to any named shared mutexes, semaphores, etc.  Finally there
+is a mount point registry version number which keeps track
 of non-backwards-compatible changes to the registry mount table layout.
-This has been "B15.0" since the beta 15 release.
+This has been @code{mounts v2} for a long time. For more exciting Cygwin
+version number details, check out the @code{/usr/include/cygwin/version.h}
+file.
 
 @subsection Why isn't _timezone set correctly?
 
diff --git a/winsup/doc/how-programming.texinfo b/winsup/doc/how-programming.texinfo
index de3286335..e183bbc84 100644
--- a/winsup/doc/how-programming.texinfo
+++ b/winsup/doc/how-programming.texinfo
@@ -43,7 +43,7 @@ would be difficult.
 Objective C is not distributed with the Cygwin version of gcc, and there
 are no plans to do so.  The gcc package maintainer had difficulty
 building it, and once built there were problems using it.  It appears
-that there is only minimual support for the Objective C front-end in the
+that there is only minimal support for the Objective C front-end in the
 main GCC distribution, anyway.
 
 @subsection Why is make behaving badly?
@@ -185,7 +185,7 @@ No, you must use one or the other, they are mutually exclusive.
 The default during compilation is to produce a console application.
 It you are writing a GUI program, you should either compile with
 -mwindows as explained above, or add the string
-"-Wl,--subsystem,windows" to the GCC commandline.
+"-Wl,--subsystem,windows" to the GCC command line.
 
 @subsection Why does make complain about a "missing separator"?
 
@@ -223,7 +223,7 @@ or
 @enumerate
 @item Extract all the object files from the .lib using LIB.EXE.
 @item Build a dummy C file referencing all the functions you need, either
-      withth a direct call or through an initialized function pointer.
+      with a direct call or through an initialized function pointer.
 @item Build a dummy LibMain.
 @item Link all the objects with this file+LibMain.
 @item Write a .def.
@@ -318,7 +318,7 @@ gcc as:
 
 @code{gcc -Wl,--heap,1024,--stack,4096 -o foo foo.c}
 
-@subsection How can I find out which dlls are needed by an executable?
+@subsection How can I find out which DLLs are needed by an executable?
 
 @samp{objdump -p} provides this information, but is rather verbose.
 
@@ -461,8 +461,8 @@ like -ltcl80 in your linker command.
 
 You can debug your application using @code{gdb}.  Make sure you
 compile it with the -g flag!  If your application calls functions in
-MS dlls, gdb will complain about not being able to load debug information
-for them when you run your program.  This is normal since these dlls
+MS DLLs, gdb will complain about not being able to load debug information
+for them when you run your program.  This is normal since these DLLs
 don't contain debugging information (and even if they did, that debug
 info would not be compatible with gdb).
 
diff --git a/winsup/doc/how-resources.texinfo b/winsup/doc/how-resources.texinfo
index 21cf28201..392e0d9d3 100644
--- a/winsup/doc/how-resources.texinfo
+++ b/winsup/doc/how-resources.texinfo
@@ -33,7 +33,7 @@ cygwin-subscribe@@cygwin.com.  To unsubscribe from the
 main list, send a message to cygwin-unsubscribe@@cygwin.com.
 In both cases, the subject and body of the message are ignored.
 
-Similarly, to subscribe to the Cygwin annoucements list, send a message
+Similarly, to subscribe to the Cygwin announcements list, send a message
 to cygwin-announce-subscribe@@cygwin.com.  To unsubscribe,
 send a message to cygwin-announce-unsubscribe@@cygwin.com.
 
diff --git a/winsup/doc/how-using.texinfo b/winsup/doc/how-using.texinfo
index eb5499dc2..aa4325a56 100644
--- a/winsup/doc/how-using.texinfo
+++ b/winsup/doc/how-using.texinfo
@@ -10,7 +10,7 @@ repair the damage, you must run Cygwin Setup again, and re-install the
 @samp{libncurses5} package.
 
 Note that Cygwin Setup won't show this option by default.  In the
-``Select packages to install'' dialogue, click on the @samp{Full/Part}
+``Select packages to install'' dialog, click on the @samp{Full/Part}
 button.  This lists all packages, even those that are already
 installed.  Scroll down to locate the @samp{libncurses5} package.
 Click on the ``cycle'' glyph until it says ``Reinstall''.  Continue
@@ -345,9 +345,9 @@ rather behave strangely, for example, with NumLock off, keys on numeric
 keyboard work, until you press usual cursor keys, when even numeric
 stop working, but they start working again after hitting alphanumeric
 key, etc. This reported to happen on localized versions of Win98 and
-Win95, and not specific to Cygwin (there're known cases of Alt+Enter
+Win95, and not specific to Cygwin; there are known cases of Alt+Enter
 (fullscreen/windowed toggle) not working and shifts sticking with
-other programs). The cause of this problem is Microsoft keyboard
+other programs. The cause of this problem is Microsoft keyboard
 localizer which by default installed in 'autoexec.bat'. Corresponding
 line looks like:
 
@@ -358,7 +358,7 @@ keyb ru,,C:\WINDOWS\COMMAND\keybrd3.sys
 (That's for russian locale.) You should comment that line if you want
 your keys working properly. Of course, this will deprive you of your
 local alphabet keyboard support, so you should think about
-another localizer. exUSSR users are of course knowledgeable of Keyrus
+another localizer. ex-USSR users are of course knowledgeable of Keyrus
 localizer, and it might work for other locales too, since it has keyboard
 layout editor. But it has russian messages and documentation ;-(
 Reference URL is http://www.hnet.ru/software/contrib/Utils/KeyRus/
@@ -377,7 +377,7 @@ cygwin1.dll without exiting @emph{all} Cygwin apps (including inetd)
 beforehand.
 
 If you're trying to find multiple versions of the DLL that are causing
-this problem, reboot first, in case DLL's still loaded in memory are the
+this problem, reboot first, in case DLLs still loaded in memory are the
 cause.  Then use the Windows System find utility to search your whole
 machine, not just components in your PATH (as 'type' would do) or
 cygwin-mounted filesystems (as Cygwin 'find' would do).
diff --git a/winsup/doc/install.texinfo b/winsup/doc/install.texinfo
index ff075767b..fd210d18a 100644
--- a/winsup/doc/install.texinfo
+++ b/winsup/doc/install.texinfo
@@ -160,7 +160,7 @@ code.
 After installation, the package archives remain in your ``Local
 Package Directory'', by default the location of @code{setup.exe}.  You
 may conserve disk space by deleting the subdirectories there.  These
-directories will have very wierd looking names, being encoded with
+directories will have very weird looking names, being encoded with
 their URLs.
 
 @subsection What if setup fails?
@@ -169,7 +169,7 @@ First, make sure that you are using the latest version of Cygwin
 Setup.  The latest version is always available from the 'Install
 Cygwin now' link on the Cygwin Home Page at @file{http://cygwin.com/}.
 
-If you are downloading from the internet, setup will fail if it cannot
+If you are downloading from the Internet, setup will fail if it cannot
 download the list of mirrors at
 @file{http://cygwin.com/mirrors.html}.  It could be that
 the network is too busy.  Similarly for an ftp download site that isn't
diff --git a/winsup/doc/readme.texinfo b/winsup/doc/readme.texinfo
index bcd32a633..6b7be641a 100644
--- a/winsup/doc/readme.texinfo
+++ b/winsup/doc/readme.texinfo
@@ -15,3 +15,5 @@ net release.)}
 @include changes.texinfo
 
 @include relnotes.texinfo
+
+@include calls.texinfo