Do not use "win" to refer to Microsoft Windows.

diff --git a/ChangeLog.2 b/ChangeLog.2
index 1f4560b5b0338b80222b2b4f6f981b6ce26b0b7f..30571bf60ae1b8ba9ce2652df6ee1437f7f76665 100644 (file)
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -9901,8 +9901,8 @@
 
 1999-08-22  Matthew D. Langston  <langston@SLAC.Stanford.EDU>
 
-       * acspecific.m4 (AC_PROG_CC): Remove uname test for win32/Cygwin,
-       and just test for `cl' as a last resort.
+       * acspecific.m4 (AC_PROG_CC): Remove uname test for 32-bit
+       Windows/Cygwin, and just test for `cl' as a last resort.
 
        * autoconf.texi (Particular Programs): Document new optional
        argument to AC_PROG_CC, AC_PROG_CXX and AC_PROG_F77.  Document

diff --git a/NEWS b/NEWS
index 2de5d2fe970e572d82d7f7d4ff1b89db95a6e25b..decad47bac998b33a2b0a7c97937033e9a73797b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1687,12 +1687,12 @@ Major changes in Autoconf 2.13:
 
   Released 1999-05-01 by Ben Elliston.
 
-* Support for building on Win32 systems where the only available C or
+* Support for building on 32-bit Windows systems where the only available C or
   C++ compiler is the Microsoft Visual C++ command line compiler
-  (`cl').  Additional support for building on Win32 systems which are
+  (`cl').  Additional support for building on 32-bit Windows systems which are
   using the Cygwin or Mingw32 environments.
 * Support for alternative object file and executable file extensions.
-  On Win32, for example, these are .obj and .exe. These are discovered
+  On 32-bit Windows, for example, these are .obj and .exe. These are discovered
   using AC_OBJEXT and AC_EXEEXT, which substitute @OBJEXT@ and
   @EXEEXT@ in the output, respectively.
 * New macros: AC_CACHE_LOAD, AC_CACHE_SAVE, AC_FUNC_SELECT_ARGTYPES,
@@ -2094,7 +2094,7 @@ Various bug fixes.
 
 -----
 
-Copyright (C) 1993-1996, 1998-2011 Free Software Foundation, Inc.
+Copyright (C) 1993-1996, 1998-2012 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright

diff --git a/lib/Autom4te/XFile.pm b/lib/Autom4te/XFile.pm
index 6800c485c0becc9c738b8386ce9b02498a16be23..ef3c7b608a558cf5e2135d0687af1c2b7f2a5375 100644 (file)
--- a/lib/Autom4te/XFile.pm
+++ b/lib/Autom4te/XFile.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2003, 2004, 2006, 2008, 2009, 2010 Free Software
+# Copyright (C) 2001, 2003, 2004, 2006, 2008, 2009, 2010, 2012 Free Software
 # Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -176,7 +176,7 @@ C<\n> on input files.
 
 =cut
 
-# Some Win32/perl installations fail to translate \r\n to \n on input
+# Some 32-bit Windows/Perl installations fail to translate \r\n to \n on input
 # so we do that here.
 sub getline
 {