Updated documentation and infrastructure files to accommodate for the fact that

the Autoconf Archive is now an official GNU project.

The main home page now resides at http://www.gnu.org/software/autoconf-archive/.
The mailing lists have moved from nongnu.org to corresponding gnu.org addresses.
All files have a proper copyright statement, even AUTHORS, ChangeLog, etc.

13 files changed, 163 insertions, 104 deletions

diff --git a/Makefile.am b/Makefile.am
index bc41c78..f502581 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,18 @@
-# Build and install the Autoconf Archive.
+# Build and install the GNU Autoconf Archive.
 #
-# Copyright (c) 2010 by the Autoconf Archive Maintainers
-# Licensed under the terms of the GNU General Public License.
+# Copyright (c) 2010 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
 
 SUBDIRS                 = doc
 
@@ -10,8 +21,6 @@ aclocaldir              = $(datadir)/aclocal
 dist_aclocal_DATA       = $(M4FILES)
 EXTRA_DIST              = build-aux/git-version-gen build-aux/gitlog-to-changelog
 
-# maintainer rules
-
 clean-local:
 	@rm -rf $(srcdir)/stage $(srcdir)/macro.pyc
 	@rm -f $(DIST_ARCHIVES)
@@ -24,12 +33,17 @@ maintainer-clean-local:
 
 dist-hook:
 	echo $(VERSION) > $(distdir)/.tarball-version
-	if test -d .git; then						\
-	  $(top_srcdir)/build-aux/gitlog-to-changelog			\
-	    >$(distdir)/cl-t -- master $(top_srcdir)/m4;		\
-	  rm -f $(distdir)/ChangeLog;					\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
-	  $(top_srcdir)/gen-authors.sh >$(distdir)/au-t;		\
-	  rm -f $(distdir)/AUTHORS;					\
-	  mv $(distdir)/au-t $(distdir)/AUTHORS;			\
+	if test -d .git; then												\
+	  echo > $(distdir)/cl-t '# Copyright (c) 2010 Free Software Foundation, Inc.';					\
+	  echo >>$(distdir)/cl-t '#';											\
+	  echo >>$(distdir)/cl-t '# Copying and distribution of this file, with or without modification, are';		\
+	  echo >>$(distdir)/cl-t '# permitted in any medium without royalty provided the copyright notice and';		\
+	  echo >>$(distdir)/cl-t '# this notice are preserved. This file is offered as-is, without any warranty.';	\
+	  echo >>$(distdir)/cl-t '';											\
+	  $(top_srcdir)/build-aux/gitlog-to-changelog >>$(distdir)/cl-t -- master $(top_srcdir)/m4;			\
+	  rm -f $(distdir)/ChangeLog;											\
+	  mv $(distdir)/cl-t $(distdir)/ChangeLog;									\
+	  $(top_srcdir)/gen-authors.sh >$(distdir)/au-t;								\
+	  rm -f $(distdir)/AUTHORS;											\
+	  mv $(distdir)/au-t $(distdir)/AUTHORS;									\
 	fi
diff --git a/NEWS b/NEWS
index b2885ea..6c229d2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,23 @@
-#+TITLE: Autoconf Archive NEWS                 -*- mode:org;fill-column:79; -*-
+#+TITLE: GNU Autoconf Archive NEWS             -*- mode:org;fill-column:79; -*-
 #+STARTUP: showall
+#
+# Copyright (c) 2010 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+  The Autoconf Archive has been declared an official GNU project.
+
   AX_PTHREAD has been fixed to provide the "-pthreads" flag on 10.6 OS X
   systems.
 
   Fixed use of $EXEEXT in AX_CHECK_JAVA_HOME, AX_PROG_JAVA, AX_PROG_JAVA_WORKS,
   AX_PROG_JAVAC, and AX_PROG_JAVADOC. Further details can be found at
-  <http://savannah.nongnu.org/patch/?6948>.
-
+  <http://savannah.gnu.org/patch/?6948>.
 
 * Noteworthy changes in release 2010.02.14 (2010-02-14) [beta]
 
diff --git a/README b/README
index 3588db8..e68374f 100644
--- a/README
+++ b/README
@@ -1,24 +1,25 @@
 Autoconf Archive
 ================
 
-The Autoconf Archive is a collection of more than 450 macros for `GNU Autoconf
-<http://www.gnu.org/software/autoconf>`_ that have been contributed as free
-software by friendly supporters of the cause from all over the Internet. Every
-single one of those macros can be re-used without imposing any restrictions
-whatsoever on the licensing of the generated `configure` script. In particular,
-it is possible to use all those macros in `configure` scripts that are meant for
-non-free software. This policy is unusual for a Free Software Foundation
-project. The FSF firmly believes that software ought to be free, and software
-licenses like the GPL are specifically designed to ensure that derivative work
-based on free software must be free as well. In case of Autoconf, however, an
-exception has been made, because Autoconf is at such a pivotal position in the
-software development tool chain that the benefits from having this tool
-available as widely as possible outweigh the disadvantage that some authors may
-choose to use it, too, for proprietary software.
+The GNU Autoconf Archive is a collection of more than 450 macros for `GNU
+Autoconf <http://www.gnu.org/software/autoconf>`_ that have been contributed as
+free software by friendly supporters of the cause from all over the Internet.
+Every single one of those macros can be re-used without imposing any
+restrictions whatsoever on the licensing of the generated `configure` script. In
+particular, it is possible to use all those macros in `configure` scripts that
+are meant for non-free software. This policy is unusual for a Free Software
+Foundation project. The FSF firmly believes that software ought to be free, and
+software licenses like the GPL are specifically designed to ensure that
+derivative work based on free software must be free as well. In case of
+Autoconf, however, an exception has been made, because Autoconf is at such a
+pivotal position in the software development tool chain that the benefits from
+having this tool available as widely as possible outweigh the disadvantage that
+some authors may choose to use it, too, for proprietary software.
 
 The best place to start exploring the Archive is the `on-line documentation
-<http://www.nongnu.org/autoconf-archive/>`_. There is also the `Autoconf Archive
-home page <http://savannah.nongnu.org/projects/autoconf-archive/>`_ at Savannah.
+<http://www.gnu.org/software/autoconf-archive/>`_. There is also the `GNU
+Autoconf Archive home page <http://savannah.gnu.org/projects/autoconf-archive/>
+at Savannah`_.
 
 Downloads
 ---------
@@ -35,15 +36,14 @@ Here are the GPG detached signatures:
 * autoconf-archive-2010.02.14.tar.bz2.sig_
 * autoconf-archive-2010.02.14.tar.xz.sig_
 
-You can use either of the above signature files to verify that the
-corresponding file (without the .sig suffix) is intact. First, be sure
-to download both the .sig file and the corresponding tarball. Then, run
-a command like this::
+You can use either of the above signature files to verify that the corresponding
+file (without the .sig suffix) is intact. First, be sure to download both the
+.sig file and the corresponding tarball. Then, run a command like this::
 
   gpg --verify autoconf-archive-2010.02.14.tar.gz.sig
 
-If that command fails because you don't have the required public key,
-then run this command to import it::
+If that command fails because you don't have the required public key, then run
+this command to import it::
 
   gpg --keyserver keys.gnupg.net --recv-keys 99089D72
 
@@ -52,19 +52,24 @@ and rerun the ``gpg --verify`` command.
 License
 -------
 
-Compilation Copyright 2010 Autoconf Archive Maintainers <autoconf-archive-maintainers@nongnu.org>
+Copyright (c) 2010 Free Software Foundation, Inc.
 
-The Autoconf Archive is free software: you can redistribute it and/or modify it
-under the terms of the `GNU General Public License version 3
-<http://www.gnu.org/licenses/gpl.html>`_ or (at your option) any later version.
+The GNU Autoconf Archive is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by the Free
+Software Foundation, either version 3 of the License, or (at your option) any
+later version.
 
-All macros are copyrighted by their respective authors. Please refer to the
-individual files for details.
+The GNU Autoconf Archive is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+details.
 
+You should have received a copy of the GNU General Public License along with the
+GNU Autoconf Archive. If not, see <http://www.gnu.org/licenses/>.
 
 .. References
 .. ..........
-
+..
 .. _autoconf-archive-2010.02.14.tar.gz : http://download.savannah.nongnu.org/releases/autoconf-archive/autoconf-archive-2010.02.14.tar.gz
 .. _autoconf-archive-2010.02.14.tar.bz2: http://download.savannah.nongnu.org/releases/autoconf-archive/autoconf-archive-2010.02.14.tar.bz2
 .. _autoconf-archive-2010.02.14.tar.xz:  http://download.savannah.nongnu.org/releases/autoconf-archive/autoconf-archive-2010.02.14.tar.xz
diff --git a/README-maint b/README-maint
index 78a8b14..965f93a 100644
--- a/README-maint
+++ b/README-maint
@@ -1,7 +1,7 @@
-#+TITLE: Autoconf Archive README-maint         -*- mode:org;fill-column:79; -*-
+#+TITLE: GNU Autoconf Archive Maintainer README  -*-mode:org;fill-column:79;-*-
 #+STARTUP: showall
 
-* How to set up the 'maint' branch.
+* How to build the archive from Git.
 
   Ensure that the following packages are installed in your system:
 
@@ -18,7 +18,6 @@
 
   : git clone ssh://[<login>@]git.sv.gnu.org/srv/git/autoconf-archive
   : cd autoconf-archive
-  : cvs -z3 -d:ext:[<login>@]cvs.savannah.nongnu.org:/web/autoconf-archive co -d html autoconf-archive
   : ./bootstrap.sh              # set up autotools and gnulib environment
   : ./configure                 # determine system properties
   : make maintainer-generate    # create/update all generated files that will be in a release
@@ -26,6 +25,10 @@
 
 * How to update the web site.
 
+  Check out the web site from CVS:
+
+  : cvs -z3 -d:ext:[<login>@]cvs.savannah.nongnu.org:/web/autoconf-archive co -d html autoconf-archive
+
   Run the following commands:
 
   : make web-manual             # generate an HTML rendering of the user documentation
diff --git a/TODO b/TODO
index f79f7ef..34a64f7 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,19 @@
 #+TITLE: Autoconf Archive TODO                 -*- mode:org;fill-column:79; -*-
+#
+# Copyright (c) 2010 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+* TODO Figure out a new link for the macro home pages.
+
+  GNU suggests http://www.gnu.org/software/autoconf-archive/macro-name.html as
+  the URL of choice for all pages, but that link is really quite long, i.e. 13
+  characters longer than, say http://autoconf-archive.gnu.org/macro-name.html,
+  would be. Even http://www.nongnu.org/autoconf-archive/macro-name.html, the
+  current choice, is 6 characters shorter than that.
 
 * TODO Improve submission guide lines on the web site
 ** Patch submissions should put the original authors on Cc.
@@ -68,15 +83,15 @@
 
   It would be desirable to have the license texts in the documentation *once*
   and to have every macro refer to the appropriate section.
-* TODO Add copyright notices to all files [1/3]
+* DONE Add copyright notices to all files [3/3]
 
   * [X] autoconf-archive.texi should say what its own (the documentation)
         copyright is in the @copying. Presumably GFDLv1.3+.
 
-  * [ ] small top-level files like NEWS, ChangeLog, TODO should have some kind
+  * [X] small top-level files like NEWS, ChangeLog, TODO should have some kind
         of notice, e.g., the all-permissive one.
 
-  * [ ] Makefile.am files should use the standard GPL notice, not just say
+  * [X] Makefile.am files should use the standard GPL notice, not just say
         "Licensed under the terms ...". That leaves it unclear as to what
         version of the GPL applies, and whether it is GPLvN-only vs.
         GPLvN-or-later.
diff --git a/bootstrap.sh b/bootstrap.sh
index 97f2054..5a57869 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,13 +23,13 @@ sed -i -e 's/^sc_file_system:/disabled_sc_file_system:/' \
        -e 's/^sc_copyright_check:/disabled_sc_copyright_check:/' \
   maint.mk
 
+echo > ChangeLog '# Copyright (c) 2010 Free Software Foundation, Inc.'
+echo >>ChangeLog '#'
+echo >>ChangeLog '# Copying and distribution of this file, with or without modification, are'
+echo >>ChangeLog '# permitted in any medium without royalty provided the copyright notice and'
+echo >>ChangeLog '# this notice are preserved. This file is offered as-is, without any warranty.'
+echo >>ChangeLog ''
+build-aux/gitlog-to-changelog >>ChangeLog -- master m4/
 ./gen-authors.sh >AUTHORS
-build-aux/gitlog-to-changelog >ChangeLog -- master m4/
 
 autoreconf --install -Wall
-
-if [ ! -d html ]; then
-  echo ""
-  echo " Remember to check out the HTML tree before running configure."
-  echo ""
-fi
diff --git a/configure.ac b/configure.ac
index c23fab9..a207adf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,23 +1,21 @@
-dnl configure the Autoconf Archive
-
-AC_INIT([autoconf-archive], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [autoconf-archive-maintainers@nongnu.org])
+dnl Configure the GNU Autoconf Archive.
+dnl
+dnl This file is free software; as a special exception the author gives
+dnl unlimited permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+AC_INIT([GNU Autoconf Archive], m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+	[autoconf-archive-maintainers@gnu.org], [autoconf-archive],
+	[http://www.gnu.org/software/autoconf-archive/])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.11 -Wall gnu dist-bzip2 dist-xz])
+AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([doc/autoconf-archive.texi])
-AC_COPYRIGHT([dnl
-Compilation Copyright 2010 Autoconf Archive Maintainers
-
-This compilation is free software: you can redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This compilation is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.])
-
-AC_MSG_NOTICE([Autoconf Archive version $VERSION])
+AC_MSG_NOTICE([$PACKAGE_STRING])
 
 M4FILES="m4_esyscmd([echo -n m4/*.m4])"
 AC_SUBST([M4FILES])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 21b272a..d1747ee 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,11 +1,22 @@
-# Build and install the Autoconf Archive Documentation.
+# Build and install the GNU Autoconf Archive documentation.
 #
-# Copyright (c) 2010 by the Autoconf Archive Maintainers
-# Licensed under the terms of the GNU General Public License.
+# Copyright (c) 2010 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
 
-CHAPTERS                = introduction.texi downloads.texi contribute.texi fdl-1.3.texi
-info_TEXINFOS           = autoconf-archive.texi
-EXTRA_DIST              = $(TEXIFILES) $(CHAPTERS) all-macros.texi
+CHAPTERS        = introduction.texi downloads.texi contribute.texi fdl-1.3.texi
+info_TEXINFOS   = autoconf-archive.texi
+EXTRA_DIST      = $(TEXIFILES) $(CHAPTERS) all-macros.texi
 
 autoconf-archive.info:  autoconf-archive.texi all-macros.texi $(TEXIFILES) $(CHAPTERS)
 
diff --git a/doc/autoconf-archive.texi b/doc/autoconf-archive.texi
index 1fb7b0a..0cf34b5 100644
--- a/doc/autoconf-archive.texi
+++ b/doc/autoconf-archive.texi
@@ -10,11 +10,11 @@
 @include version.texi
 
 @copying
-This manual is for Autoconf Archive version @value{VERSION}, a collection of
+This manual is for GNU Autoconf Archive version @value{VERSION}, a collection of
 freely re-usable Autoconf macros.
 
-Copyright @copyright{} 2010 Autoconf Archive Maintainers
-@email{autoconf-archive-maintainers@@nongnu.org}
+Copyright @copyright{} 2010 Free Software Foundation, Inc.
+@email{autoconf-archive-maintainers@@gnu.org}
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -26,13 +26,13 @@ Documentation License''.
 
 @dircategory Software development
 @direntry
-* Autoconf Archive: (autoconf-archive).     A collection of re-usable Autoconf macros.
+* Autoconf Archive: (autoconf-archive). A collection of re-usable Autoconf macros.
 @end direntry
 
 @titlepage
-@title Autoconf Archive
+@title GNU Autoconf Archive
 @subtitle Version @value{VERSION}
-@author @email{autoconf-archive-maintainers@@nongnu.org}
+@author @email{autoconf-archive-maintainers@@gnu.org}
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -42,7 +42,7 @@ Documentation License''.
 
 @ifnottex
 @node Top
-@top Autoconf Archive
+@top GNU Autoconf Archive
 
 @insertcopying
 @end ifnottex
@@ -60,11 +60,11 @@ Documentation License''.
 @include introduction.texi
 
 @node Downloads
-@chapter Downloading the Autoconf Archive
+@chapter Downloading the GNU Autoconf Archive
 @include downloads.texi
 
 @node How to contribute
-@chapter How to contributing to the Autoconf Archive
+@chapter How to contributing to the GNU Autoconf Archive
 @include contribute.texi
 
 @node The Macros
diff --git a/doc/contribute.texi b/doc/contribute.texi
index 891e5e9..df16cbe 100644
--- a/doc/contribute.texi
+++ b/doc/contribute.texi
@@ -42,7 +42,7 @@ AU_ALIAS([OLD_NAME], [AX_NEW_NAME])
 @section Submitting Macros
 
 Please post to the
-@uref{https://savannah.nongnu.org/patch/?func=additem&group=autoconf-archive,patch
+@uref{http://savannah.gnu.org/patch/?func=additem&group=autoconf-archive,patch
 tracker} to submit a macro for inclusion in the Archive. Your submission should
 contain:
 
@@ -79,4 +79,3 @@ macro should be flexible enough to suit all of these uses.
 
 See the @uref{http://www.flameeyes.eu/autotools-mythbuster, Autotools
 Mythbuster} for suggestions on how to write well-encapsulated, portable macros.
-
diff --git a/doc/downloads.texi b/doc/downloads.texi
index e43667f..a3ba261 100644
--- a/doc/downloads.texi
+++ b/doc/downloads.texi
@@ -5,14 +5,12 @@ Archive. Gitweb offers an
 @uref{http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=rss,RSS
 feed} for subscription that informs about changes to the repository. The same
 information is available via e-mail, too, on the
-@uref{http://lists.nongnu.org/mailman/listinfo/autoconf-archive-commits,commits
+@uref{http://lists.gnu.org/mailman/listinfo/autoconf-archive-commits,commits
 mailing list}.
 
-For the benefit of everyone who doesn't use Git, traditional release archives
-can be downloaded from
-@uref{http://download.savannah.nongnu.org/releases/autoconf-archive/}. New
-release are always announced on the low-traffic
-@uref{http://lists.nongnu.org/mailman/listinfo/autoconf-archive-announce,announcements
+For the benefit of everyone who doesn't use Git, traditional release
+archives can be downloaded from
+@uref{ftp://ftp.gnu.org/pub/gnu/autoconf-archive/} or any other GNU
+mirror . New release are always announced on the low-traffic
+@uref{http://lists.gnu.org/mailman/listinfo/autoconf-archive-announce,announcements
 mailing list}.
-
-
diff --git a/doc/introduction.texi b/doc/introduction.texi
index 067de2c..3bb3ac7 100644
--- a/doc/introduction.texi
+++ b/doc/introduction.texi
@@ -1,4 +1,4 @@
-The Autoconf Archive is a collection of more than 450 macros for
+The GNU Autoconf Archive is a collection of more than 450 macros for
 @uref{http://www.gnu.org/software/autoconf,GNU Autoconf} that have been
 contributed as free software by friendly supporters of the cause from all over
 the Internet. Every single one of those macros can be re-used without imposing
@@ -15,9 +15,9 @@ disadvantage that some authors may choose to use it, too, for proprietary
 software.
 
 This official web site of this project is located at
-@uref{http://savannah.nongnu.org/projects/autoconf-archive/}. All available
-information concerning this project is referenced from there.
+@uref{http://www.gnu.org/software/autoconf-archive/}. All available information
+concerning this project is referenced from there.
 
 If you have questions, suggestions, are any other feedback that you'd like to
 share, then please don't hesitate to contact the Archive maintainers at
-@email{autoconf-archive-maintainers@@nongnu.org}.
+@email{autoconf-archive-maintainers@@gnu.org}.
diff --git a/gen-authors.sh b/gen-authors.sh
index 41905b7..be861f9 100755
--- a/gen-authors.sh
+++ b/gen-authors.sh
@@ -7,6 +7,13 @@ trap 'rm -f AUTHORS-m4.tmp AUTHORS-git.tmp' 0
 sed -n -e 's/# *Copyright (c) [0-9,-]* *//p' m4/*.m4 >AUTHORS-m4.tmp
 git log | sed -n -e 's/^Author: *//p' >AUTHORS-git.tmp
 
+echo '# Copyright (c) 2010 Free Software Foundation, Inc.'
+echo '#'
+echo '# Copying and distribution of this file, with or without modification, are'
+echo '# permitted in any medium without royalty provided the copyright notice and this'
+echo '# notice are preserved. This file is offered as-is, without any warranty.'
+echo ''
+
 cat AUTHORS-m4.tmp AUTHORS-git.tmp \
   | sed -e 's/ *<.*>.*//' \
 	-e 's/^Bogdan$/Bogdan Drozdowski/' \