changeset 12836:39251fa967fc

autoupdate
author Karl Berry <karl@freefriends.org>
date Thu, 28 Jan 2010 07:16:59 -0800
parents 7217c0b5595d
children fff2b96bad5e
files build-aux/compile doc/maintain.texi
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -3,7 +3,7 @@
 
 scriptversion=2009-10-06.20; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
 # Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
--- a/doc/maintain.texi
+++ b/doc/maintain.texi
@@ -5,7 +5,7 @@
 @c For double-sided printing, uncomment:
 @c @setchapternewpage odd
 @c This date is automagically updated when you save this file:
-@set lastupdate December 12, 2009
+@set lastupdate January 27, 2010
 @c %**end of header
 
 @dircategory GNU organization
@@ -23,7 +23,7 @@
 Information for maintainers of GNU software, last updated @value{lastupdate}.
 
 Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 Foundation, Inc.
 
 @quotation
@@ -558,9 +558,12 @@
 A copyright notice looks like this:
 
 @example
-Copyright (C) @var{year1}, @var{year2}, @var{year3}  @var{copyright-holder}
+Copyright (C) @var{year1}, @var{year2}, @var{year3} @var{copyright-holder}
 @end example
 
+The word @samp{Copyright} must always be in English, by international
+convention.
+
 The @var{copyright-holder} may be the Free Software Foundation, Inc., or
 someone else; you should know who is the copyright holder for your
 package.
@@ -571,7 +574,8 @@
 will work.  For example, a program's standard @option{--version}
 message should use parenthesized @samp{C} by default, though message
 translations may use C-in-a-circle in locales where that symbol is
-known to work.
+known to work.  Alternatively, the @samp{(C)} or C-in-a-circle can be
+omitted entirely; the word @samp{Copyright} suffices.
 
 To update the list of year numbers, add each year in which you have
 made nontrivial changes to the package.  (Here we assume you're using