gnustandards ChangeLog maintain.texi

[Karl Berry]

CVSROOT:        /sources/gnustandards
Module name:    gnustandards
Changes by:     Karl Berry <karl>       10/01/27 22:09:09

Modified files:
        .              : ChangeLog maintain.texi 

Log message:
        clarify syntax details of copyright line

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnustandards/ChangeLog?cvsroot=gnustandards&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/gnustandards/maintain.texi?cvsroot=gnustandards&r1=1.177&r2=1.178

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnustandards/gnustandards/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- ChangeLog   12 Dec 2009 16:48:10 -0000      1.103
+++ ChangeLog   27 Jan 2010 22:09:09 -0000      1.104
@@ -1,3 +1,19 @@
+2010-01-27  Karl Berry  <address@hidden>
+
+       * maintain.texi (Copyright Notices): Normalize whitespace;
+       clarify "Copyright" being in English and C-in-a-circle or (C) not
+       being a requirement.
+
+2010-01-24  Ralf Wildenhues  <address@hidden>
+
+       * doc/make-stds.texi (Makefile Basics): corrected to sed -f sedscript,
+       not sed -e.
+
+2010-01-05  Karl Berry  <address@hidden>
+
+       * make-stds.texi (Standard Targets): Don't explicitly mention any 
+       compression formats other than gzip.
+
 2009-12-12  Karl Berry  <address@hidden>
 
        * maintain.texi (Automated Upload Procedure): try to be more

Index: maintain.texi
===================================================================
RCS file: /sources/gnustandards/gnustandards/maintain.texi,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- maintain.texi       12 Dec 2009 16:48:10 -0000      1.177
+++ maintain.texi       27 Jan 2010 22:09:09 -0000      1.178
@@ -5,7 +5,7 @@
 @c For double-sided printing, uncomment:
 @c @setchapternewpage odd
 @c This date is automagically updated when you save this file:
address@hidden lastupdate December 12, 2009
address@hidden 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
@@ -561,6 +561,9 @@
 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