Update.

1999-08-27  Ulrich Drepper  <drepper@cygnus.com>

	* manual/argp.texi: Fixing language and types.
	* manual/conf.texi: Likewise.
	* manual/contrib.texi: Likewise.
	* manual/filesys.texi: Likewise.
	* manual/install.texi: Likewise.
	* manual/job.texi: Likewise.
	* manual/lang.texi: Likewise.
	* manual/llio.texi: Likewise.
	* manual/math.texi: Likewise.
	* manual/nss.texi: Likewise.
	* manual/pipe.texi: Likewise.
	* manual/signal.texi: Likewise.
	* manual/socket.texi: Likewise.
	* manual/stdio.texi: Likewise.
	* manual/sysinfo.texi: Likewise.
	* manual/users.texi: Likewise.
	Patches by Neil Booth <NeilB@earthling.net>.

17 files changed, 1078 insertions, 1087 deletions

diff --git a/ChangeLog b/ChangeLog
index 6332f64be0..f89b3552c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+1999-08-27  Ulrich Drepper  <drepper@cygnus.com>
+
+	* manual/argp.texi: Fixing language and types.
+	* manual/conf.texi: Likewise.
+	* manual/contrib.texi: Likewise.
+	* manual/filesys.texi: Likewise.
+	* manual/install.texi: Likewise.
+	* manual/job.texi: Likewise.
+	* manual/lang.texi: Likewise.
+	* manual/llio.texi: Likewise.
+	* manual/math.texi: Likewise.
+	* manual/nss.texi: Likewise.
+	* manual/pipe.texi: Likewise.
+	* manual/signal.texi: Likewise.
+	* manual/socket.texi: Likewise.
+	* manual/stdio.texi: Likewise.
+	* manual/sysinfo.texi: Likewise.
+	* manual/users.texi: Likewise.
+	Patches by Neil Booth <NeilB@earthling.net>.
+
 1999-08-25  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/i386/fpu/bits/mathinline.h (__finite): Mark constant as
diff --git a/manual/argp.texi b/manual/argp.texi
index 4847468bda..0c4a85cc7b 100644
--- a/manual/argp.texi
+++ b/manual/argp.texi
@@ -112,7 +112,7 @@ flag is used).
 @comment GNU
 @deftypevar {const char *} argp_program_bug_address
 If defined or set by the user program to a non-zero value,
-@code{argp_program_bug_address} should point to string that is the
+@code{argp_program_bug_address} should point to a string that is the
 bug-reporting address for the program.  It will be printed at the end of
 the standard output for the @samp{--help} option, embedded in a sentence
 that says something like @samp{Report bugs to @var{address}.}.
@@ -180,7 +180,7 @@ If non-zero, a string describing what non-option arguments are wanted by
 this parser; it is only used to print the @samp{Usage:} message.  If it
 contains newlines, the strings separated by them are considered
 alternative usage patterns, and printed on separate lines (lines after
-the first are prefix by @samp{ or: } instead of @samp{Usage:}).
+the first are prefixed by @samp{ or: } instead of @samp{Usage:}).
 
 @item const char *doc
 If non-zero, a string containing extra text to be printed before and
diff --git a/manual/conf.texi b/manual/conf.texi
index 8815a16d2b..bd866eccaa 100644
--- a/manual/conf.texi
+++ b/manual/conf.texi
@@ -446,7 +446,7 @@ Inquire about the parameter corresponding to @code{_POSIX_SEMAPHORES}.
 @comment unistd.h
 @comment POSIX.1
 @item _SC_SHARED_MEMORY_OBJECTS
-Inquire about the parameter corresponding to
+Inquire about the parameter corresponding to@*
 @code{_POSIX_SHARED_MEMORY_OBJECTS}.
 
 @comment unistd.h
@@ -580,7 +580,7 @@ Inquire about the parameter corresponding to @code{_POSIX_THREADS}.
 @comment unistd.h
 @comment POSIX.1
 @item _SC_THREAD_SAFE_FUNCTIONS
-Inquire about the parameter corresponding to
+Inquire about the parameter corresponding to@*
 @code{_POSIX_THREAD_SAFE_FUNCTIONS}.
 
 @comment unistd.h
@@ -627,13 +627,13 @@ Inquire about the parameter corresponding to @code{_POSIX_THREAD_THREADS_MAX}.
 @comment unistd.h
 @comment POSIX.1
 @item _SC_THREAD_ATTR_STACKADDR
-Inquire about the parameter corresponding to
+Inquire about the parameter corresponding to@*a
 @code{_POSIX_THREAD_ATTR_STACKADDR}.
 
 @comment unistd.h
 @comment POSIX.1
 @item _SC_THREAD_ATTR_STACKSIZE
-Inquire about the parameter corresponding to
+Inquire about the parameter corresponding to@*
 @code{_POSIX_THREAD_ATTR_STACKSIZE}.
 
 @comment unistd.h
@@ -760,27 +760,27 @@ Inquire about the virtual memory page size of the machine.
 @comment unistd.h
 @comment GNU
 @item _SC_NPROCESSORS_CONF
-Inquire about number of configured processors.
+Inquire about the number of configured processors.
 
 @comment unistd.h
 @comment GNU
 @item _SC_NPROCESSORS_ONLN
-Inquire about number of processors online.
+Inquire about the number of processors online.
 
 @comment unistd.h
 @comment GNU
 @item _SC_PHYS_PAGES
-Inquire about number of physical pages in the system.
+Inquire about the number of physical pages in the system.
 
 @comment unistd.h
 @comment GNU
 @item _SC_AVPHYS_PAGES
-Inquire about number of available physical pages in the system.
+Inquire about the number of available physical pages in the system.
 
 @comment unistd.h
 @comment GNU
 @item _SC_ATEXIT_MAX
-Inquire about number of functions which can be registered as termination
+Inquire about the number of functions which can be registered as termination
 functions for @code{atexit}; @pxref{Cleanups on Exit}.
 
 @comment unistd.h
@@ -831,41 +831,41 @@ Inquire about the parameter corresponding to @code{_XOPEN_XPG4}.
 @comment unistd.h
 @comment X/Open
 @item _SC_CHAR_BIT
-Inquire about number of bits in a variable of type @code{char}.
+Inquire about the number of bits in a variable of type @code{char}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_CHAR_MAX
-Inquire about maximum value which can be stored in a variable of type
+Inquire about the maximum value which can be stored in a variable of type
 @code{char}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_CHAR_MIN
-Inquire about minimum value which can be stored in a variable of type
+Inquire about the minimum value which can be stored in a variable of type
 @code{char}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_INT_MAX
-Inquire about maximum value which can be stored in a variable of type
+Inquire about the maximum value which can be stored in a variable of type
 @code{int}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_INT_MIN
-Inquire about minimum value which can be stored in a variable of type
+Inquire about the minimum value which can be stored in a variable of type
 @code{int}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_LONG_BIT
-Inquire about number of bits in a variable of type @code{long int}.
+Inquire about the number of bits in a variable of type @code{long int}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_WORD_BIT
-Inquire about number of bits in a variable of a register word.
+Inquire about the number of bits in a variable of a register word.
 
 @comment unistd.h
 @comment X/Open
@@ -876,61 +876,61 @@ character value.
 @comment unistd.h
 @comment X/Open
 @item _SC_NZERO
-Inquire value used to internally represent the zero priority level for
+Inquire about the value used to internally represent the zero priority level for
 the process execution.
 
 @comment unistd.h
 @comment X/Open
 @item SC_SSIZE_MAX
-Inquire about maximum value which can be stored in a variable of type
+Inquire about the maximum value which can be stored in a variable of type
 @code{ssize_t}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_SCHAR_MAX
-Inquire about maximum value which can be stored in a variable of type
+Inquire about the maximum value which can be stored in a variable of type
 @code{signed char}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_SCHAR_MIN
-Inquire about minimum value which can be stored in a variable of type
+Inquire about the minimum value which can be stored in a variable of type
 @code{signed char}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_SHRT_MAX
-Inquire about maximum value which can be stored in a variable of type
+Inquire about the maximum value which can be stored in a variable of type
 @code{short int}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_SHRT_MIN
-Inquire about minimum value which can be stored in a variable of type
+Inquire about the minimum value which can be stored in a variable of type
 @code{short int}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_UCHAR_MAX
-Inquire about maximum value which can be stored in a variable of type
+Inquire about the maximum value which can be stored in a variable of type
 @code{unsigned char}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_UINT_MAX
-Inquire about maximum value which can be stored in a variable of type
+Inquire about the maximum value which can be stored in a variable of type
 @code{unsigned int}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_ULONG_MAX
-Inquire about maximum value which can be stored in a variable of type
+Inquire about the maximum value which can be stored in a variable of type
 @code{unsigned long int}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_USHRT_MAX
-Inquire about maximum value which can be stored in a variable of type
+Inquire about the maximum value which can be stored in a variable of type
 @code{unsigned short int}.
 
 @comment unistd.h
@@ -956,12 +956,12 @@ Inquire about  the parameter corresponding to @code{NL_NMAX}.
 @comment unistd.h
 @comment X/Open
 @item _SC_NL_SETMAX
-Inquire about  the parameter corresponding to @code{NL_SETMAX}.
+Inquire about the parameter corresponding to @code{NL_SETMAX}.
 
 @comment unistd.h
 @comment X/Open
 @item _SC_NL_TEXTMAX
-Inquire about  the parameter corresponding to @code{NL_TEXTMAX}.
+Inquire about the parameter corresponding to @code{NL_TEXTMAX}.
 @end table
 
 @node Examples of Sysconf
@@ -1023,7 +1023,7 @@ system you are using can go that far.
 The most restrictive limit permitted by POSIX for the maximum number of
 I/O operations that can be specified in a list I/O call.  The value of
 this constant is @code{2}; thus you can add up to two new entries
-of the list of outstandard operations.
+of the list of outstanding operations.
 
 @comment limits.h
 @comment POSIX.1
@@ -1191,7 +1191,7 @@ that big!  Use dynamic allocation (@pxref{Memory Allocation}) instead.
 POSIX defines certain system-specific options in the system calls for
 operating on files.  Some systems support these options and others do
 not.  Since these options are provided in the kernel, not in the
-library, simply using the GNU C library does not guarantee any of these
+library, simply using the GNU C library does not guarantee that any of these
 features is supported; it depends on the system you are using.  They can
 also vary between file systems on a single machine.
 
diff --git a/manual/contrib.texi b/manual/contrib.texi
index 55f2edb66d..c339d2aaac 100644
--- a/manual/contrib.texi
+++ b/manual/contrib.texi
@@ -8,7 +8,7 @@ contributed or worked on by other people.
 
 @itemize @bullet
 @item
-The @code{getopt} function and related code were written by
+The @code{getopt} function and related code was written by
 Richard Stallman, @w{David J.} MacKenzie, and @w{Roland McGrath}.
 
 @item
diff --git a/manual/filesys.texi b/manual/filesys.texi
index 29f20758e8..88ff6360c8 100644
--- a/manual/filesys.texi
+++ b/manual/filesys.texi
@@ -5,7 +5,7 @@
 This chapter describes the GNU C library's functions for manipulating
 files.  Unlike the input and output functions (@pxref{I/O on Streams};
 @pxref{Low-Level I/O}), these functions are concerned with operating
-on the files themselves, rather than on their contents.
+on the files themselves rather than on their contents.
 
 Among the facilities described in this chapter are functions for
 examining or modifying directories, functions for renaming and deleting
@@ -251,8 +251,8 @@ The only way you can tell that the directory entries belong to a
 single file is that they have the same value for the @code{d_fileno}
 field.
 
-File attributes such as size, modification times, and the like are part
-of the file itself, not any particular directory entry.  @xref{File
+File attributes such as size, modification times etc., are part of the
+file itself, not of any particular directory entry.  @xref{File
 Attributes}.
 @end deftp
 
@@ -320,7 +320,7 @@ returns a pointer to a structure containing information about the file.
 This structure is statically allocated and can be rewritten by a
 subsequent call.
 
-@strong{Portability Note:} On some systems, @code{readdir} may not
+@strong{Portability Note:} On some systems @code{readdir} may not
 return entries for @file{.} and @file{..}, even though these are always
 valid file names in any directory.  @xref{File Name Resolution}.
 
@@ -343,9 +343,9 @@ value.  Use @code{readdir_r} when this is critical.
 @deftypefun int readdir_r (DIR *@var{dirstream}, struct dirent *@var{entry}, struct dirent **@var{result})
 This function is the reentrant version of @code{readdir}.  Like
 @code{readdir} it returns the next entry from the directory.  But to
-prevent conflicts for simultaneously running threads the result is not
-stored in some internal memory.  Instead the argument @var{entry} has to
-point to a place where the result is stored.
+prevent conflicts between simultaneously running threads the result is
+not stored in statically allocated memory.  Instead the argument
+@var{entry} points to a place to store the result.
 
 The return value is @code{0} in case the next entry was read
 successfully.  In this case a pointer to the result is returned in
@@ -357,14 +357,14 @@ the function returns a value indicating the error (as described for
 If there are no more directory entries, @code{readdir_r}'s return value is
 @code{0}, and *@var{result} is set to @code{NULL}.
 
-@strong{Portability Note:} On some systems, @code{readdir_r} may not
-return a terminated string as the file name even if no @code{d_reclen}
-element is available in @code{struct dirent} and the file name as the
-maximal allowed size.  Modern systems all have the @code{d_reclen} field
-and on old systems multi threading is not critical.  In any case, there
-is no such problem with the @code{readdir} function so that even on
-systems without @code{d_reclen} field one could use multiple threads by
-using external locking.
+@strong{Portability Note:} On some systems @code{readdir_r} may not
+return a NUL terminated string for the file name, even when there is no
+@code{d_reclen} field in @code{struct dirent} and the file
+name is the maximum allowed size.  Modern systems all have the
+@code{d_reclen} field, and on old systems multi-threading is not
+critical.  In any case there is no such problem with the @code{readdir}
+function, so that even on systems without the @code{d_reclen} member one
+could use multiple threads by using external locking.
 @end deftypefun
 
 @comment dirent.h
@@ -443,38 +443,38 @@ closing and reopening the directory can invalidate values returned by
 
 A higher-level interface to the directory handling functions is the
 @code{scandir} function.  With its help one can select a subset of the
-entries in a directory, possibly sort them and get as the result a list
-of names.
+entries in a directory, possibly sort them and get a list of names as
+the result.
 
 @comment dirent.h
 @comment BSD/SVID
 @deftypefun int scandir (const char *@var{dir}, struct dirent ***@var{namelist}, int (*@var{selector}) (const struct dirent *), int (*@var{cmp}) (const void *, const void *))
 
 The @code{scandir} function scans the contents of the directory selected
-by @var{dir}.  The result in @var{namelist} is an array of pointers to
+by @var{dir}.  The result in *@var{namelist} is an array of pointers to
 structure of type @code{struct dirent} which describe all selected
 directory entries and which is allocated using @code{malloc}.  Instead
 of always getting all directory entries returned, the user supplied
 function @var{selector} can be used to decide which entries are in the
-result.  Only the entries for which @var{selector} returns a nonzero
+result.  Only the entries for which @var{selector} returns a non-zero
 value are selected.
 
-Finally the entries in the @var{namelist} are sorted using the user
-supplied function @var{cmp}.  The arguments of the @var{cmp} function
-are of type @code{struct dirent **}.  I.e., one cannot directly use the
-@code{strcmp} or @code{strcoll} function; see the functions
-@code{alphasort} and @code{versionsort} below.
+Finally the entries in *@var{namelist} are sorted using the
+user-supplied function @var{cmp}.  The arguments passed to the @var{cmp}
+function are of type @code{struct dirent **}, therefore one cannot
+directly use the @code{strcmp} or @code{strcoll} functions; instead see
+the functions @code{alphasort} and @code{versionsort} below.
 
-The return value of the function gives the number of entries placed in
-@var{namelist}.  If it is @code{-1} an error occurred (either the
+The return value of the function is the number of entries placed in
+*@var{namelist}.  If it is @code{-1} an error occurred (either the
 directory could not be opened for reading or the malloc call failed) and
 the global variable @code{errno} contains more information on the error.
 @end deftypefun
 
-As said above the fourth argument to the @code{scandir} function must be
-a pointer to a sorting function.  For the convenience of the programmer
-the GNU C library contains implementations of functions which are very
-helpful for this purpose.
+As described above the fourth argument to the @code{scandir} function
+must be a pointer to a sorting function.  For the convenience of the
+programmer the GNU C library contains implementations of functions which
+are very helpful for this purpose.
 
 @comment dirent.h
 @comment BSD/SVID
@@ -484,14 +484,14 @@ The @code{alphasort} function behaves like the @code{strcoll} function
 are not string pointers but instead they are of type
 @code{struct dirent **}.
 
-Return value of @code{alphasort} is less than, equal to, or greater than
-zero depending on the order of the two entries @var{a} and @var{b}.
+The return value of @code{alphasort} is less than, equal to, or greater
+than zero depending on the order of the two entries @var{a} and @var{b}.
 @end deftypefun
 
 @comment dirent.h
 @comment GNU
 @deftypefun int versionsort (const void *@var{a}, const void *@var{b})
-The @code{versionsort} function is like @code{alphasort}, excepted that it
+The @code{versionsort} function is like @code{alphasort} except that it
 uses the @code{strverscmp} function internally.
 @end deftypefun
 
@@ -504,20 +504,19 @@ dirent64}}.  To use this we need a new function.
 @comment GNU
 @deftypefun int scandir64 (const char *@var{dir}, struct dirent64 ***@var{namelist}, int (*@var{selector}) (const struct dirent64 *), int (*@var{cmp}) (const void *, const void *))
 The @code{scandir64} function works like the @code{scandir} function
-only that the directory entries it returns are described by elements of
-type @w{@code{struct dirent64}}.  The function pointed to by
-@var{selector} is again used to select the wanted entries only that
+except that the directory entries it returns are described by elements
+of type @w{@code{struct dirent64}}.  The function pointed to by
+@var{selector} is again used to select the desired entries, except that
 @var{selector} now must point to a function which takes a
 @w{@code{struct dirent64 *}} parameter.
 
-The @var{cmp} now must be a function which expects its two arguments to
-be of type @code{struct dirent64 **}.
+Similarly the @var{cmp} function should expect its two arguments to be
+of type @code{struct dirent64 **}.
 @end deftypefun
 
-As just said the function expected as the fourth is different from the
-function expected in @code{scandir}.  Therefore we cannot use the
-@code{alphasort} and @code{versionsort} functions anymore.  Instead we
-have two similar functions available.
+As @var{cmp} is now a function of a different type, the functions
+@code{alphasort} and @code{versionsort} cannot be supplied for that
+argument.  Instead we provide the two replacement functions below.
 
 @comment dirent.h
 @comment GNU
@@ -538,7 +537,7 @@ The @code{versionsort64} function is like @code{alphasort64}, excepted that it
 uses the @code{strverscmp} function internally.
 @end deftypefun
 
-It is important not to mix the use of @code{scandir} and the 64 bits
+It is important not to mix the use of @code{scandir} and the 64-bit
 comparison functions or vice versa.  There are systems on which this
 works but on others it will fail miserably.
 
@@ -547,35 +546,37 @@ works but on others it will fail miserably.
 
 Here is a revised version of the directory lister found above
 (@pxref{Simple Directory Lister}).  Using the @code{scandir} function we
-can avoid using the functions which directly work with the directory
-contents.  After the call the found entries are available for direct
-used.
+can avoid the functions which work directly with the directory contents.
+After the call the returned entries are available for direct use.
 
 @smallexample
 @include dir2.c.texi
 @end smallexample
 
-Please note the simple selector function for this example.  Since
-we want to see all directory entries we always return @code{1}.
+Note the simple selector function in this example.  Since we want to see
+all directory entries we always return @code{1}.
 
 
-@node Working on Directory Trees
-@section Working on Directory Trees
+@node Working with Directory Trees
+@section Working with Directory Trees
 @cindex directory hierarchy
 @cindex hierarchy, directory
 @cindex tree, directory
 
-The functions to handle files in directories described so far allowed to
-retrieve all the information in small pieces or process all files in a
-directory (see @code{scandir}).  Sometimes it is useful to process whole
-hierarchies of directories and the contained files.  The X/Open
-specification def