gnustandards ChangeLog maintain.texi

[Karl Berry]

CVSROOT:        /sources/gnustandards
Module name:    gnustandards
Changes by:     Karl Berry <karl>       11/01/15 01:36:24

Modified files:
        .              : ChangeLog maintain.texi 

Log message:
        (License Notices for Code): include instructions from gpl-howto.html 
for constructing the LGPL notice; consistently use {package} rather than 
{program}

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnustandards/ChangeLog?cvsroot=gnustandards&r1=1.133&r2=1.134
http://cvs.savannah.gnu.org/viewcvs/gnustandards/maintain.texi?cvsroot=gnustandards&r1=1.197&r2=1.198

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnustandards/gnustandards/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- ChangeLog   15 Jan 2011 01:33:11 -0000      1.133
+++ ChangeLog   15 Jan 2011 01:36:24 -0000      1.134
@@ -1,5 +1,11 @@
 2011-01-14  Karl Berry  <address@hidden>
 
+       * maintain.texi: consistently use {package} rather than
+       {program}; other small source updates.
+
+       * maintain.texi (License Notices for Code): include instructions
+       from gpl-howto.html for constructing the LGPL notice.
+
        * maintain.texi (Licensing of GNU Packages): new node,
        with wording for dual-license LGPLv2+|GPLv3+.  (Approved by rms
        and lawyers.)

Index: maintain.texi
===================================================================
RCS file: /sources/gnustandards/gnustandards/maintain.texi,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -b -r1.197 -r1.198
--- maintain.texi       15 Jan 2011 01:33:11 -0000      1.197
+++ maintain.texi       15 Jan 2011 01:36:24 -0000      1.198
@@ -288,7 +288,7 @@
 
 @quotation
 Would you be willing to assign the copyright to the Free Software
-Foundation, so that we could install it in @var{program}?
+Foundation, so that we could install it in @var{package}?
 @end quotation
 
 @noindent
@@ -296,7 +296,7 @@
 
 @quotation
 Would you be willing to sign a copyright disclaimer to put this change
-in the public domain, so that we can install it in @var{program}?
+in the public domain, so that we can install it in @var{package}?
 @end quotation
 
 If the contributor then wants more information, you can send per the file
@@ -362,7 +362,7 @@
 For a translation of a manual, use @file{assign.translation.manual}.
 
 For translations of program strings (as used by GNU Gettext, for
-example; @pxref{Internationalization,,,standards,GNU Coding
+example; @pxref{Internationalization,,, standards, GNU Coding
 Standards}), use @file{disclaim.translation}.  If you make use of the
 Translation Project (@url{http://translationproject.org}) facilities,
 please check with the TP coordinators that they have sent the
@@ -682,7 +682,7 @@
 copy of its plain text version also (conventionally in a file named
 @file{COPYING.LESSER}).
 
-If you have questions about license issues for your GNU package,
+If you have questions about licensing issues for your GNU package,
 please write @email{licensing@@gnu.org}.
 
 @menu
@@ -769,7 +769,7 @@
 The official Texinfo sources for the licenses are also available in
 those same places, so you can include them in your documentation.  A
 GFDL-covered manual should include the GFDL in this way.  @xref{GNU
-Sample Texts,,,texinfo,Texinfo}, for a full example in a Texinfo
+Sample Texts,,, texinfo, Texinfo}, for a full example in a Texinfo
 manual.
 
 
@@ -780,14 +780,14 @@
 configure files and makefiles) should cite the GPL, like this:
 
 @quotation
-This file is part of GNU @var{program}.
+This file is part of GNU @var{package}.
 
-GNU @var{program} is free software: you can redistribute it and/or
+GNU @var{package} 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.
 
-GNU @var{program} is distributed in the hope that it will be useful,
+GNU @var{package} 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.
@@ -814,6 +814,12 @@
 along with this program.  If not, see @url{http://www.gnu.org/licenses/}.
 @end quotation
 
+In either case, for those few packages which use the Lesser GPL
+(@pxref{Licensing of GNU Packages}), insert the word ``Lesser'' before
+``General'' in @emph{all three} places.
address@hidden://@/www.gnu.org/@/licenses/@/gpl-howto.html} discusses 
application
+the GPL in more detail.
+
 
 @node License Notices for Documentation
 @subsection License Notices for Documentation
@@ -847,7 +853,7 @@
 If your manual is not published by the FSF, and under 400 pages, you
 can omit both cover texts.
 
address@hidden Sample Texts,,,texinfo,Texinfo}, for a full example in a
address@hidden Sample Texts,,, texinfo, Texinfo}, for a full example in a
 Texinfo manual, and see
 @url{http://www.gnu.org/licenses/fdl-howto.html} for more advice about
 how to use the GNU FDL.
@@ -1040,7 +1046,7 @@
 Once a program is in use, you will get bug reports for it.  Most GNU
 programs have their own special lists for sending bug reports.  The
 advertised bug-reporting email address should always be
address@hidden@var{program}@@gnu.org}, to help show users that the program
address@hidden@var{package}@@gnu.org}, to help show users that the program
 is a GNU package, but it is ok to set up that list to forward to another
 site if you prefer.  The package distribution should state the
 name of the bug-reporting list in a prominent place, and ask users to
@@ -1054,14 +1060,14 @@
 
 @cindex help for users, mailing list for
 Some GNU programs with many users have another mailing list,
address@hidden@var{program}.org}, for people to ask other users for help.
address@hidden@var{package}.org}, for people to ask other users for help.
 If your program has many users, you should create such a list for it.
 For a fairly new program, which doesn't have a large user base yet, it
 is better not to bother with this.
 
 @cindex announcements, mailing list for
 If you wish, you can also have a mailing list
address@hidden@var{program}} for announcements (@pxref{Announcements}),
address@hidden@var{package}} for announcements (@pxref{Announcements}),
 and any others you find useful.
 
 
@@ -1393,14 +1399,14 @@
 
 @item
 In the @samp{My Account Conf} page on @code{savannah}, upload the GPG
-key you will use to sign your packages.
+key you will use to sign your packages.  If you haven't created one
+before, you can do so with the command @code{gpg --gen-key}.
 
-You can create a key with the command @code{gpg --gen-key}.  It is
-good to also send your key to the GPG public key server: @code{gpg
---keyserver keys.gnupg.net --send-keys @var{keyid}}, where @var{keyid}
-is the eight hex digits reported by @code{gpg --list-public-keys} on
-the @code{pub} line before the date.  For full information about GPG,
-see @url{http://www.gnu.org/software/gpg}.
+Optional but recommended: Send your key to a GPG public key server:
address@hidden --keyserver keys.gnupg.net --send-keys @var{keyid}}, where
address@hidden is the eight hex digits reported by @code{gpg
+--list-public-keys} on the @code{pub} line before the date.  For full
+information about GPG, see @url{http://www.gnu.org/software/gpg}.
 
 @item
 Compose a message with the following items in some @var{msgfile}.
@@ -1414,7 +1420,7 @@
 preferred email address.
 
 @item
-An ASCII armored copy of your GnuPG key, as an attachment.  (@samp{gpg
+An ASCII armored copy of your GPG key, as an attachment.  (@samp{gpg
 --export -a @var{your_key_id} >mykey.asc} should give you this.)
 
 @item
@@ -1423,7 +1429,7 @@
 don't make all releases yourself).
 
 @item
-ASCII armored copies of GnuPG keys for any individuals listed in (3).
+ASCII armored copies of GPG keys for any individuals listed in (3).
 @end enumerate
 @end enumerate
 
@@ -1683,7 +1689,7 @@
 
 @cindex announcement mailing list, project-specific
 You can maintain your own mailing list (typically
address@hidden@var{program}@@gnu.org}) for announcements as well if you
address@hidden@var{package}@@gnu.org}) for announcements as well if you
 like.  For your own list, of course you decide as you see fit what
 events are worth announcing.  (@xref{Mail}, for setting this up, and
 more suggestions on handling mail for your package.)