Hello,
here's a patch to fix some typos, en_UK vs en_US differences and
inconsistencies. I could apply it, but I guess it needs approval
from some parties...
Cheers,
Ralf
* doc/functions.texi, doc/gnulib-tool.texi, doc/gnulib.texi:
Fix some typos.
* doc/maintain.texi, doc/make-stds.texi, doc/standards.texi:
Fix some typos.
Index: doc/functions.texi
===================================================================
RCS file: /cvsroot/gnulib/gnulib/doc/functions.texi,v
retrieving revision 1.4
diff -u -r1.4 functions.texi
--- doc/functions.texi 29 Jun 2006 22:15:49 -0000 1.4
+++ doc/functions.texi 9 Jul 2006 15:08:15 -0000
@@ -237,7 +237,7 @@
fail with @code{EINVAL}, instead of returning a truncated host name.
@item getopt
-The default behaviour of the glibc implementation of @code{getopt} allows
+The default behavior of the glibc implementation of @code{getopt} allows
mixing option and non-option arguments on the command line in any order.
Other implementations, such as the one in Cygwin, enforce strict POSIX
compliance: they require that the option arguments precede the non-option
@@ -588,7 +588,7 @@
except that @code{SIG_IGN} for @code{SIGCHLD} has the effect that the children
execution times are not accounted in the @code{times} function.
On some systems (BSD? SystemV? Linux?), you need to use the @code{sigaction}
-flag @code{SA_NOCLDWAIT} in order to obtain this behaviour.
+flag @code{SA_NOCLDWAIT} in order to obtain this behavior.
@item sigaltstack
@code{sigaltstack} doesn't work on HP-UX 11/IA-64 and OpenBSD 3.6/Sparc64.
@@ -601,7 +601,7 @@
reinstalling itself as a handler. On BSD systems and glibc systems, on the
other hand, when the signal is triggered, the kernel blocks the signal
before invoking the handler. This is saner, but POSIX still allows either
-behaviour. To avoid this problem, use @code{sigaction} instead of
+behavior. To avoid this problem, use @code{sigaction} instead of
@code{signal}.
@item sigtimedwait
Index: doc/gnulib-tool.texi
===================================================================
RCS file: /cvsroot/gnulib/gnulib/doc/gnulib-tool.texi,v
retrieving revision 1.3
diff -u -r1.3 gnulib-tool.texi
--- doc/gnulib-tool.texi 19 Jun 2006 20:40:26 -0000 1.3
+++ doc/gnulib-tool.texi 9 Jul 2006 15:08:15 -0000
@@ -7,7 +7,7 @@
The @command{gnulib-tool} command is the recommended way to import
Gnulib modules. It is possible to borrow Gnulib modules in a package
without using @command{gnulib-tool}, relying only on the
-metainformation stored in the @file{modules/*} files, but with a
+meta-information stored in the @file{modules/*} files, but with a
growing number of modules this becomes tedious. @command{gnulib-tool}
simplifies the management of source files, @file{Makefile.am}s and
@file{configure.ac} in packages incorporating Gnulib modules.
@@ -106,12 +106,12 @@
Some Gnulib modules depend on other Gnulib modules. @code{gnulib-tool}
will automatically add the needed modules as well; you need not list
-them explicitly. @code{gnulib-tool} will also memoize which dependent
+them explicitly. @code{gnulib-tool} will also memorize which dependent
modules it has added, so that when someday a dependency is dropped, the
implicitly added module is dropped as well (unless you have explicitly
requested that module).
-If you want to cut a dependency, i.e. not add a module although one of
+If you want to cut a dependency, i.e., not add a module although one of
your requested modules depends on it, you may use the option
@[EMAIL PROTECTED] to do so. Multiple uses of this option are
possible. Of course, you will then need to implement the same interface
Index: doc/gnulib.texi
===================================================================
RCS file: /cvsroot/gnulib/gnulib/doc/gnulib.texi,v
retrieving revision 1.23
diff -u -r1.23 gnulib.texi
--- doc/gnulib.texi 21 Jun 2006 17:22:32 -0000 1.23
+++ doc/gnulib.texi 9 Jul 2006 15:08:15 -0000
@@ -210,7 +210,7 @@
However, we realize that some applications may not want to have the
GSS library abort execution in any situation. The GSS library support
a hook to let the application regain control and perform its own
-cleanups when an out of memory situation has occured. The application
+cleanups when an out of memory situation has occurred. The application
can define a function (having a @code{void} prototype, i.e., no return
value and no parameters) and set the library variable
@code{xalloc_fail_func} to that function. The variable should be
Index: doc/maintain.texi
===================================================================
RCS file: /cvsroot/gnulib/gnulib/doc/maintain.texi,v
retrieving revision 1.20
diff -u -r1.20 maintain.texi
--- doc/maintain.texi 22 Mar 2006 21:21:31 -0000 1.20
+++ doc/maintain.texi 9 Jul 2006 15:08:16 -0000
@@ -1001,8 +1001,8 @@
@node Distribution on ftp.gnu.org
@section Distribution on @code{ftp.gnu.org}
[EMAIL PROTECTED] GNU ftp site
[EMAIL PROTECTED] @code{ftp.gnu.org}, the GNU ftp site
[EMAIL PROTECTED] GNU FTP site
[EMAIL PROTECTED] @code{ftp.gnu.org}, the GNU FTP site
GNU packages are distributed through directory @file{/gnu} on
@code{ftp.gnu.org}. Each package should have a subdirectory
@@ -1023,7 +1023,7 @@
@cindex beta releases
@cindex pretest releases
[EMAIL PROTECTED] @code{alpha.gnu.org}, ftp site for test releases
[EMAIL PROTECTED] @code{alpha.gnu.org}, FTP site for test releases
When you release a greatly changed new major version of a program, you
might want to do so as a pretest. This means that you make a tar file,
but send it only to a group of volunteers that you have recruited. (Use
@@ -1068,7 +1068,7 @@
@node Automated FTP Uploads
@section Automated FTP Uploads
[EMAIL PROTECTED] ftp uploads, automated
[EMAIL PROTECTED] FTP uploads, automated
In order to upload new releases to @code{ftp.gnu.org} or
@code{alpha.gnu.org}, you first need to register the necessary
information. Then, you can perform uploads yourself, with no
@@ -1119,12 +1119,12 @@
@cindex uploads
Once you have registered your information, as described in the
-previous section, you will be able to do unattended ftp uploads using
+previous section, you will be able to do unattended FTP uploads using
the following procedure.
For each upload destined for @code{ftp.gnu.org} or
@code{alpha.gnu.org}, three files (a @dfn{triplet}) need to be
-uploaded via ftp to the host @code{ftp-upload.gnu.org}.
+uploaded via FTP to the host @code{ftp-upload.gnu.org}.
@enumerate
@item
@@ -1140,7 +1140,7 @@
@end enumerate
-Upload the triplet via anonymous ftp to @code{ftp-upload.gnu.org}. If
+Upload the triplet via anonymous FTP to @code{ftp-upload.gnu.org}. If
the upload is destined for @code{ftp.gnu.org}, then place the triplet
in the @file{/incoming/ftp} directory. If the upload is destined for
@code{alpha.gnu.org}, then place the triplet in the
@@ -1261,7 +1261,7 @@
The script @command{gendocs.sh} eases the task of generating the
Texinfo documentation output for your web pages
section above. It has a companion template file, used as the basis
-for the html index pages. Both are available from the Texinfo CVS
+for the HTML index pages. Both are available from the Texinfo CVS
sources:
@format
@uref{http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs.sh}
@@ -1505,7 +1505,7 @@
repository for your package, and using @code{ftp.gnu.org} as the
standard FTP site. It is ok to use other machines if you wish. If you
use a company's machine to hold the repository for your program, or as
-its ftp site, please put this statement in a prominent place on the
+its FTP site, please put this statement in a prominent place on the
site, so as to prevent people from getting the wrong idea about the
relationship between the package and the company:
Index: doc/make-stds.texi
===================================================================
RCS file: /cvsroot/gnulib/gnulib/doc/make-stds.texi,v
retrieving revision 1.9
diff -u -r1.9 make-stds.texi
--- doc/make-stds.texi 8 May 2006 13:22:22 -0000 1.9
+++ doc/make-stds.texi 9 Jul 2006 15:08:17 -0000
@@ -264,7 +264,7 @@
and @code{INSTALL_DATA}. (The default for @code{INSTALL_PROGRAM} should
be @code{$(INSTALL)}; the default for @code{INSTALL_DATA} should be
@[EMAIL PROTECTED]@} -m 644}.) Then it should use those variables as the
-commands for actual installation, for executables and nonexecutables
+commands for actual installation, for executables and non-executables
respectively. Minimal use of these variables is as follows:
@example
@@ -642,7 +642,7 @@
@item srcdir
The directory for the sources being compiled. The value of this
variable is normally inserted by the @code{configure} shell script.
-(If you are using Autconf, use @samp{srcdir = @@srcdir@@}.)
+(If you are using Autoconf, use @samp{srcdir = @@srcdir@@}.)
@end table
For example:
Index: doc/standards.texi
===================================================================
RCS file: /cvsroot/gnulib/gnulib/doc/standards.texi,v
retrieving revision 1.17
diff -u -r1.17 standards.texi
--- doc/standards.texi 24 May 2006 21:47:25 -0000 1.17
+++ doc/standards.texi 9 Jul 2006 15:08:18 -0000
@@ -219,12 +219,12 @@
@section Trademarks
@cindex trademarks
-Please do not include any trademark acknowledgements in GNU software
+Please do not include any trademark acknowledgments in GNU software
packages or documentation.
-Trademark acknowledgements are the statements that such-and-such is a
+Trademark acknowledgments are the statements that such-and-such is a
trademark of so-and-so. The GNU Project has no objection to the basic
-idea of trademarks, but these acknowledgements feel like kowtowing,
+idea of trademarks, but these acknowledgments feel like kowtowing,
and there is no legal requirement for them, so we don't use them.
What is legally required, as regards other people's trademarks, is to
@@ -886,7 +886,7 @@
(preferably @samp{-o} or @samp{--output}). Even if you allow an output
file name as an ordinary argument for compatibility, try to provide an
option as another way to specify it. This will lead to more consistency
-among GNU utilities, and fewer idiosyncracies for users to remember.
+among GNU utilities, and fewer idiosyncrasies for users to remember.
@cindex standard command-line options
@cindex options, standard command-line
@@ -1943,7 +1943,7 @@
@item socket
Specify a file descriptor for a network server to use for its socket,
instead of opening and binding a new socket. This provides a way to
-run, in a nonpriveledged process, a server that normally needs a
+run, in a non-privileged process, a server that normally needs a
reserved port number.
@item sort
@@ -3001,7 +3001,7 @@
Adding @code{gettext} calls to this code cannot give correct results for
all languages, because negation in some languages requires adding words
at more than one place in the sentence. By contrast, adding
[EMAIL PROTECTED] calls does the job straightfowardly if the code starts
[EMAIL PROTECTED] calls does the job straightforwardly if the code starts
out like this:
@example
@@ -3274,7 +3274,7 @@
variables. The previous descriptions of functions and variables in the
section will also have given information about the topic. A description
written to stand alone would repeat some of that information; this
-redundance looks bad. Meanwhile, the informality that is acceptable in
+redundancy looks bad. Meanwhile, the informality that is acceptable in
a documentation string is totally unacceptable in a manual.
The only good way to use documentation strings in writing a good manual
@@ -3884,7 +3884,7 @@
@file{COPYING}. If the GNU LGPL is used, it should be in a file called
@file{COPYING.LIB}.
-Naturally, all the source files must be in the distribution. It is okay
+Naturally, all the source files must be in the distribution. It is ok
to include non-source files in the distribution, provided they are
up-to-date and machine-independent, so that building the distribution
normally will never modify them. We commonly include non-source files
cvs diff: Diffing doc/Copyright
