Hello M4 patchers,

Here's a couple of patches to fix a bunch of typos in CVS M4.
For your convenience, I've split into purely en_US vs. en_UK
differences and more severe issues; note there is one hunk of
overlap, which I put into the severe patch and which you may
want to adjust to be en_UK should you want to drop the other
patch.  ;-)

Cheers,
Ralf

        * doc/m4.texinfo, tests/others.at: Fix typos.

        * doc/m4.texinfo: Fix en_UK spelling.
        * doc/m4.texinfo, tests/others.at: Fix typos.

Index: doc/m4.texinfo
===================================================================
RCS file: /cvsroot/m4/m4/doc/m4.texinfo,v
retrieving revision 1.23
diff -u -r1.23 m4.texinfo
--- doc/m4.texinfo      5 Jul 2006 20:54:15 -0000       1.23
+++ doc/m4.texinfo      7 Jul 2006 18:17:49 -0000
@@ -276,7 +276,7 @@
 
 The @code{m4} macro processor is widely available on all UNIXes.
 Usually, only a small percentage of users are aware of its existence.
-However, those who find it often become commited users.  The
+However, those who find it often become committed users.  The
 popularity of GNU Autoconf, which prerequires GNU @code{m4} for
 @emph{generating} the @file{configure} scripts, is an incentive
 for many to install it, while these people will not themselves
@@ -330,7 +330,7 @@
 Language: 2nd edition'', Electronic Announcement on comp.compilers
 newsgroup (1992).
 
-Francois Pinard took over maintainance of GNU @code{m4} in 1992, until
+Francois Pinard took over maintenance of GNU @code{m4} in 1992, until
 1994 when he released GNU @code{m4} 1.4, which was the stable release
 for 10 years.  In 2004, Paul Eggert released 1.4.1 and 1.4.2 which
 addressed some long standing bugs in the venerable 1.4 release.
@@ -354,7 +354,7 @@
 @cindex options, command line
 All options begin with @samp{-}, or if long option names are used, with
 a @samp{--}.  A long option name need not be written completely, any
-unambigous prefix is sufficient.  @code{m4} understands the following
+unambiguous prefix is sufficient.  @code{m4} understands the following
 options:
 
 @table @code
@@ -383,7 +383,7 @@
 @item -Q
 @itemx --quiet
 @itemx --silent
-Suppress warnings about missing or superflous arguments in macro calls.
+Suppress warnings about missing or superfluous arguments in macro calls.
 
 @item -P
 @itemx --prefix-builtins
@@ -1131,7 +1131,7 @@
 is not so in UNIX implementations of @code{m4}, which only recognize
 one digit.
 
-As a special case, the zero'th argument, @code{$0}, is always the name
+As a special case, the zeroth argument, @code{$0}, is always the name
 of the macro being expanded.
 
 @example
@@ -1885,11 +1885,11 @@
 Show the name of the current input file in each trace output line.
 
 @item l
-Show the the current input line number in each trace output line.
+Show the current input line number in each trace output line.
 
 @item p
 Print a message when a named file is found through the path search
-mecanism (@pxref{Search Path}), giving the actual file name used.
+mechanism (@pxref{Search Path}), giving the actual file name used.
 
 @item i
 Print a message each time the current input file is changed, giving file
@@ -2360,7 +2360,7 @@
 
 There is obviously an overlap with @code{changecom} and
 @code{changequote}.  Comment delimiters and quotes can now be defined in
-two different ways.  To avoid incompatibilites, if the quotes are set
+two different ways.  To avoid incompatibilities, if the quotes are set
 with @code{changequote}, all characters marked in the syntax table as
 quotes will be unmarked, leaving only one set of defined quotes as
 before.  Since the quotes are syntax attributes rather than syntax
@@ -2421,7 +2421,7 @@
 Note how it is possible to have both long and short quotes, if
 @code{changequote} is used before @code{changesyntax}.
 
-The syntax table is initialiased to be backwards compatible, so if you
+The syntax table is initialized to be backwards compatible, so if you
 never call @code{changesyntax}, nothing will have changed.
 
 Debugging output continue to use @kbd{(}, @kbd{,} and @kbd{)} to show
@@ -3147,7 +3147,7 @@
 @end deffn
 
 When used with two arguments, while @code{eregexp} returns the position
-of the match, @code{epatsusbt} deletes it:
+of the match, @code{epatsubst} deletes it:
 
 @example
 epatsubst(`GNUs not Unix', `^', `OBS: ')
@@ -3987,7 +3987,7 @@
 diversion were made, and not where it was inserted again.
 
 @item
-GNU @code{m4} makes no attempt at prohiting autoreferential definitions
+GNU @code{m4} makes no attempt at prohibiting autoreferential definitions
 like:
 
 @comment ignore
Index: tests/others.at
===================================================================
RCS file: /cvsroot/m4/m4/tests/others.at,v
retrieving revision 1.17
diff -u -r1.17 others.at
--- tests/others.at     5 Jul 2006 20:54:15 -0000       1.17
+++ tests/others.at     7 Jul 2006 18:17:50 -0000
@@ -256,7 +256,7 @@
 
 # Eh eh eh...
 # We can't embed iso8859.m4 in here since precisly this file demonstrates
-# an M4 ``bug'': it's inability to handle the NUL character.  So there
+# an M4 ``bug'': its inability to handle the NUL character.  So there
 # is no use in trying to handle it here...  Well, until autom4te provides
 # us with means to.
 
        * doc/m4.texinfo: Fix en_UK spelling.

Index: doc/m4.texinfo
===================================================================
RCS file: /cvsroot/m4/m4/doc/m4.texinfo,v
retrieving revision 1.23
diff -u -r1.23 m4.texinfo
--- doc/m4.texinfo      5 Jul 2006 20:54:15 -0000       1.23
+++ doc/m4.texinfo      7 Jul 2006 18:17:49 -0000
@@ -412,7 +412,7 @@
 
 @item -s
 @itemx --synclines
-Generate synchronisation lines, for use by the C preprocessor or other
+Generate synchronization lines, for use by the C preprocessor or other
 similar tools.  This is useful, for example, when @code{m4} is used as a
 front end to a compiler.  Source file name and line number information
 is conveyed by directives of the form @samp{#line @var{linenum}
@@ -422,9 +422,9 @@
 @var{linenum}.  The @samp{"@var{filename}"} part is often omitted when
 the file name did not change from the previous directive.
 
-Synchronisation directives are always given on complete lines per
-themselves.  When a synchronisation discrepancy occurs in the middle of
-an output line, the associated synchronisation directive is delayed
+Synchronization directives are always given on complete lines per
+themselves.  When a synchronization discrepancy occurs in the middle of
+an output line, the associated synchronization directive is delayed
 until the beginning of the next generated line.  @xref{Syncoutput}, for
 runtime control.
 
@@ -609,7 +609,7 @@
 
 @noindent
 The @samp{Builtin} declaration declares that this macro is implemented
-as an m4 builtin; any parenthesised word immediately following is the
+as an m4 builtin; any parenthesized word immediately following is the
 name of the module that must be loaded.  The standards modules include
 @samp{m4} (which is always available), @samp{gnu} (for @sc{gnu} specific
 m4 extensions) and @samp{traditional} (for compatibility with System V
@@ -1071,7 +1071,7 @@
 
 The first argument to @code{define} does not have to be a simple word.
 It can be any text string.  A macro with a non standard name cannot be
-invoked in the normal way, as the name is not recognised.  It can only
+invoked in the normal way, as the name is not recognized.  It can only
 be referenced by the builtins @ref{Indir} and @ref{Defn}.
 
 @cindex arrays
@@ -2152,7 +2152,7 @@
 Characters that themselves, alone, form macro names.  No default.
 
 @item Escape
-Characters that must precede macro names for them to be recognised.  No
+Characters that must precede macro names for them to be recognized.  No
 default.
 
 @end table
@@ -2307,7 +2307,7 @@
 
 Macro calls can be given a @TeX{} or Texinfo like syntax using an
 escape.  If one or more characters are defined as escapes macro names
-are only recognised if preceded by an escape character.
+are only recognized if preceded by an escape character.
 
 If the escape is not followed by what is normally a word (a letter
 optionally followed by letters and/or numerals), that single character
@@ -2850,7 +2850,7 @@
 @deffn {Builtin (load)} load (@var{module-name})
 @var{module-name} will be searched for along the module search path
 (@pxref{Standard Modules}) and loaded if found.  Loading a module
-consists of running its initialisation function (if any) and then adding
+consists of running its initialization function (if any) and then adding
 any macros it provides to the internal table.
 
 The macro @code{load} is recognized only with parameters.
@@ -2879,7 +2879,7 @@
 removed by naming them as the @var{module-name} parameter of the
 @code{unload} macro.  Unloading a module consists of removing all of the
 macros it provides from the internal table of visible macros, and
-running the module's finalisation method (if any).
+running the module's finalization method (if any).
 
 The macro @code{unload} is recognized only with parameters.
 @end deffn
_______________________________________________
M4-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/m4-patches

Reply via email to