autoupdate

[gnulib.git] / doc / maintain.texi

diff --git a/doc/maintain.texi b/doc/maintain.texi
index 7d4f582..0cdaa0d 100644 (file)
--- 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:
 @c For double-sided printing, uncomment:
 @c @setchapternewpage odd
 @c This date is automagically updated when you save this file:

-@set lastupdate December 9, 2010
+@set lastupdate September 5, 2011

 @c %**end of header
 
 @dircategory GNU organization
 @c %**end of header
 
 @dircategory GNU organization


@@ -23,8 +23,8 @@
 Information for maintainers of GNU software, last updated @value{lastupdate}.
 
 Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 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, 2010 Free Software
-Foundation, Inc.
+2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+2010, 2011 Free Software Foundation, Inc.

 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document


@@ -93,8 +93,8 @@ In addition to this document, please read and follow the GNU Coding
 Standards (@pxref{Top, , Contents, standards, GNU Coding Standards}).
 
 @cindex @code{bug-standards@@gnu.org} email address
 Standards (@pxref{Top, , Contents, standards, GNU Coding Standards}).
 
 @cindex @code{bug-standards@@gnu.org} email address

-@cindex Savannah repository for gnustandards
-@cindex gnustandards project repository
+@cindex Savannah repository for @code{gnustandards}
+@cindex @code{gnustandards} project repository

 Please send corrections or suggestions for this document to
 @email{bug-standards@@gnu.org}.  If you make a suggestion, please
 include suggested new wording if you can.  We prefer a context diff to
 Please send corrections or suggestions for this document to
 @email{bug-standards@@gnu.org}.  If you make a suggestion, please
 include suggested new wording if you can.  We prefer a context diff to


@@ -128,10 +128,12 @@ This release of the GNU Maintainer Information was last updated
 @cindex help, getting
 
 @cindex @code{mentors@@gnu.org} mailing list
 @cindex help, getting
 
 @cindex @code{mentors@@gnu.org} mailing list

-If you have general questions or encounter a situation where it isn't
-clear what to do, you can ask @email{mentors@@gnu.org}, which is a
-list of a few experienced GNU contributors who have offered to answer
-questions for new maintainers.
+If you have any general questions or encounter a situation where it
+isn't clear how to get something done or who to ask, you (as a GNU
+contributor) can always write to @email{mentors@@gnu.org}, which is a
+list of a few experienced GNU folks who have volunteered to answer
+questions.  Any GNU-related question is fair game for the
+@code{mentors} list.

 
 @cindex advisory committee
 The GNU Advisory Committee helps to coordinate activities in the GNU
 
 @cindex advisory committee
 The GNU Advisory Committee helps to coordinate activities in the GNU


@@ -142,6 +144,21 @@ committee at @email{gnu-advisory@@gnu.org}.  See
 committee members.  Additional information is in
 @file{/gd/gnuorg/advisory}.
 
 committee members.  Additional information is in
 @file{/gd/gnuorg/advisory}.
 

+@cindex down, when GNU machines are
+@cindex outage, of GNU machines
+@cindex @url{http://identi.ca/group/fsfstatus}
+If you find that any GNU computer systems (@code{fencepost.gnu.org},
+@code{ftp.gnu.org}, @code{www.gnu.org}, @code{savannah.gnu.org},
+@dots{}) seem to be down, you can check the current status at
+@url{http://identi.ca/group/fsfstatus}.  Most likely the problem, if
+it can be alleviated at the FSF end, is already being worked on.
+
+@cindex sysadmin, FSF
+@cindex FSF system administrators
+@cindex GNU system administrators
+The FSF system administrators are responsible for the network and GNU
+hardware.  You can email them at @email{sysadmin@@fsf.org}, but please
+try not to burden them unnecessarily.

 
 
 @node Getting a GNU Account
 
 
 @node Getting a GNU Account


@@ -162,15 +179,6 @@ the package.
 
 @gdgnuorgtext{}
 
 
 @gdgnuorgtext{}
 

-@cindex down, when GNU machines are
-@cindex outage, of GNU machines
-@cindex @url{http://identi.ca/group/fsfstatus}
-If you find that any GNU computer systems (@code{fencepost.gnu.org},
-@code{ftp.gnu.org}, @code{www.gnu.org}, @code{savannah.gnu.org},
-@dots{}) seem to be down, you can check the current status at
-@url{http://identi.ca/group/fsfstatus}.  Most likely the problem, if
-it can be alleviated at the FSF end, is already being worked on.
-

 
 @node Stepping Down
 @chapter Stepping Down
 
 @node Stepping Down
 @chapter Stepping Down


@@ -192,12 +200,11 @@ If you have an idea for who should take over, please tell
 maintainer needs the GNU Project's confirmation, but your judgment that
 a person is capable of doing the job will carry a lot of weight.
 
 maintainer needs the GNU Project's confirmation, but your judgment that
 a person is capable of doing the job will carry a lot of weight.
 

-As your final act as maintainer, it would be helpful to set up the
-package under @code{savannah.gnu.org} if it is not there already
-(@pxref{Old Versions}).  This will make it much easier for the new
-maintainer to pick up where you left off and will ensure that the
-source tree is not misplaced if it takes us a while to find a new
-maintainer.
+As your final act as maintainer, it would be helpful to set up or
+update the package under @code{savannah.gnu.org} (@pxref{Old
+Versions}).  This will make it much easier for the new maintainer to
+pick up where you left off and will ensure that the source tree is not
+misplaced if it takes us a while to find a new maintainer.

 
 
 @node Recruiting Developers
 
 
 @node Recruiting Developers


@@ -288,7 +295,7 @@ this:
 
 @quotation
 Would you be willing to assign the copyright to the Free Software
 
 @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
 @end quotation
 
 @noindent


@@ -296,7 +303,7 @@ or
 
 @quotation
 Would you be willing to sign a copyright disclaimer to put this change
 
 @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
 @end quotation
 
 If the contributor then wants more information, you can send per the file


@@ -362,7 +369,7 @@ changes to a manual, you can use @file{assign.future.manual}.
 For a translation of a manual, use @file{assign.translation.manual}.
 
 For translations of program strings (as used by GNU Gettext, for
 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
 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,17 +689,73 @@ any files distributed under the Lesser GPL, it should contain a full
 copy of its plain text version also (conventionally in a file named
 @file{COPYING.LESSER}).
 
 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
 please write @email{licensing@@gnu.org}.
 
 @menu

-* Source: Canonical License Sources.
-* Code: License Notices for Code.
+* Which:         Licensing of GNU Packages.
+* Canonical:     Canonical License Sources.
+* Code:          License Notices for Code.

 * Documentation: License Notices for Documentation.
 * Documentation: License Notices for Documentation.

-* Other: License Notices for Other Files.
+* Other:         License Notices for Other Files.

 @end menu
 
 
 @end menu
 
 

+@node Licensing of GNU Packages
+@subsection Licensing of GNU Packages
+
+Normally, GNU packages should use the latest version of the GNU GPL,
+with the ``or any later version'' formulation.  @xref{License Notices
+for Code}, for the exact wording of the license notice.
+
+Occasionally, a GNU library may provide functionality which is already
+widely available to proprietary programs through alternative
+implementations; for example, the GNU C Library.  In such cases, the
+Lesser GPL should be used (again, for the notice wording,
+@pxref{License Notices for Code}).  If a GNU library provides unique
+functionality, however, the GNU GPL should be used.
+@url{http://www.gnu.org/licenses/why-not-lgpl.html} discusses this
+strategic choice.
+
+Some of these libraries need to work with programs released under
+GPLv2-only; that is, which allow the GNU GPL version 2 but not later
+versions.  In this case, the GNU package should be released under a
+dual license: GNU GPL version 2 (or any later version) and the GNU
+Lesser GPL version 3 (or any later version).  Here is the notice for
+that case:
+
+@smallexample
+This file is part of GNU @var{package}.
+
+GNU @var{package} is free software: you can redistribute it and/or
+modify it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * the GNU General Public License as published by the Free
+    Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+or both in parallel, as here.
+
+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.
+
+You should have received copies of the GNU General Public License and
+the GNU Lesser General Public License along with this program.  If
+not, see @url{http://www.gnu.org/licenses/}.
+@end smallexample
+
+For small packages, you can use ``This program'' instead of ``GNU
+@var{package}''.
+
+

 @node Canonical License Sources
 @subsection Canonical License Sources
 
 @node Canonical License Sources
 @subsection Canonical License Sources
 


@@ -713,7 +776,7 @@ can access via anonymous Git or CVS.  See
 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
 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.
 
 
 manual.
 
 


@@ -724,14 +787,14 @@ Typically the license notice for program files (including build scripts,
 configure files and makefiles) should cite the GPL, like this:
 
 @quotation
 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.
 
 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.
 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.


@@ -758,6 +821,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see @url{http://www.gnu.org/licenses/}.
 @end quotation
 
 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.
+@url{http://@/www.gnu.org/@/licenses/@/gpl-howto.html} discusses application
+the GPL in more detail.
+

 
 @node License Notices for Documentation
 @subsection License Notices for Documentation
 
 @node License Notices for Documentation
 @subsection License Notices for Documentation


@@ -791,7 +860,7 @@ manual.  If there are none, then say ``with no Invariant Sections''.
 If your manual is not published by the FSF, and under 400 pages, you
 can omit both cover texts.
 
 If your manual is not published by the FSF, and under 400 pages, you
 can omit both cover texts.
 

-@xref{GNU Sample Texts,,,texinfo,Texinfo}, for a full example in a
+@xref{GNU 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.
 Texinfo manual, and see
 @url{http://www.gnu.org/licenses/fdl-howto.html} for more advice about
 how to use the GNU FDL.


@@ -984,7 +1053,7 @@ have them.
 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
 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

-@samp{bug-@var{program}@@gnu.org}, to help show users that the program
+@samp{bug-@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
 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


@@ -998,14 +1067,14 @@ move away from using @email{bug-gnu-utils}.
 
 @cindex help for users, mailing list for
 Some GNU programs with many users have another mailing list,
 
 @cindex help for users, mailing list for
 Some GNU programs with many users have another mailing list,

-@samp{help-@var{program}.org}, for people to ask other users for help.
+@samp{help-@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
 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

-@samp{info-@var{program}} for announcements (@pxref{Announcements}),
+@samp{info-@var{package}} for announcements (@pxref{Announcements}),

 and any others you find useful.
 
 
 and any others you find useful.
 
 


@@ -1100,9 +1169,10 @@ useful for your package.
 
 It is very important to keep backup files of all source files of GNU.
 You can do this using a source control system (such as Bazaar, RCS,
 
 It is very important to keep backup files of all source files of GNU.
 You can do this using a source control system (such as Bazaar, RCS,

-CVS, Git, Subversion, @dots{}) if you like.  The easiest way to use
-RCS or CVS is via the Version Control library in Emacs (@pxref{VC
-Concepts,, Concepts of Version Control, emacs, The GNU Emacs Manual}).
+CVS, Git, Subversion, @dots{}) if you like.  An easy way to use
+many such systems is via the Version Control library in Emacs
+(@pxref{Introduction to VC,, Introduction to Version Control, emacs,
+The GNU Emacs Manual}).

 
 The history of previous revisions and log entries is very important for
 future maintainers of the package, so even if you do not make it
 
 The history of previous revisions and log entries is very important for
 future maintainers of the package, so even if you do not make it


@@ -1111,16 +1181,18 @@ change log that you would not want to hand over to another maintainer
 some day.
 
 @cindex @code{savannah-hackers@@gnu.org}
 some day.
 
 @cindex @code{savannah-hackers@@gnu.org}

-The GNU Project provides a server that GNU software packages can use
+The GNU Project provides a server that GNU packages can use

 for source control and other package needs: @code{savannah.gnu.org}.
 Savannah is managed by @email{savannah-hackers@@gnu.org}.  For more
 details on using and contributing to Savannah, see
 @url{http://savannah.gnu.org/maintenance}.
 
 for source control and other package needs: @code{savannah.gnu.org}.
 Savannah is managed by @email{savannah-hackers@@gnu.org}.  For more
 details on using and contributing to Savannah, see
 @url{http://savannah.gnu.org/maintenance}.
 

-It's not a requirement, but all GNU maintainers are strongly
+It's not an absolute requirement, but all GNU maintainers are strongly

 encouraged to take advantage of Savannah, as sharing such a central
 encouraged to take advantage of Savannah, as sharing such a central

-point can serve to foster a sense of community among GNU developers
-and help in keeping up with project management.
+point can serve to foster a sense of community among GNU developers as
+well as help in keeping up with project management.  Please don't mark
+Savannah projects for GNU packages as private; that defeats a large
+part of the purpose of using Savannah in the first place.

 
 @cindex @code{savannah-announce@@gnu.org} mailing list
 If you do use Savannah, please subscribe to the
 
 @cindex @code{savannah-announce@@gnu.org} mailing list
 If you do use Savannah, please subscribe to the


@@ -1337,14 +1409,15 @@ maintain the web pages at @url{http://www.gnu.org} for your project
 
 @item
 In the @samp{My Account Conf} page on @code{savannah}, upload the GPG
 
 @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
+accept all the default answers to its questions).

 
 

-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:
+@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}.

 
 @item
 Compose a message with the following items in some @var{msgfile}.
 
 @item
 Compose a message with the following items in some @var{msgfile}.


@@ -1354,11 +1427,11 @@ finally email the resulting @file{@var{msgfile}.asc}), to
 
 @enumerate
 @item
 
 @enumerate
 @item

-Name of package(s) that you are the maintainer for, and your
-preferred email address.
+Name of package(s) that you are the maintainer for, your
+preferred email address, and your Savannah username.

 
 @item
 
 @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
 --export -a @var{your_key_id} >mykey.asc} should give you this.)
 
 @item


@@ -1367,7 +1440,7 @@ authorize to make releases for which packages, if any (in the case that you
 don't make all releases yourself).
 
 @item
 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
 
 @end enumerate
 @end enumerate
 


@@ -1627,7 +1700,7 @@ on the GNU Planet web page.
 
 @cindex announcement mailing list, project-specific
 You can maintain your own mailing list (typically
 
 @cindex announcement mailing list, project-specific
 You can maintain your own mailing list (typically

-@email{info-@var{program}@@gnu.org}) for announcements as well if you
+@email{info-@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.)
 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.)


@@ -1653,7 +1726,7 @@ useful to mention the mirror list at
 redirect to a nearby mirror.
 
 @item
 redirect to a nearby mirror.
 
 @item

-The NEWS (@pxref{NEWS File,,, standards, GNU Coding Standards}) for
+The @t{NEWS} (@pxref{NEWS File,,, standards, GNU Coding Standards}) for

 the present release.
 @end itemize
 
 the present release.
 @end itemize
 


@@ -1969,32 +2042,36 @@ about GNU.
 
 @node Free Software and Open Source
 @section Free Software and Open Source
 
 @node Free Software and Open Source
 @section Free Software and Open Source

-@cindex free software
+@cindex free software movement

 @cindex open source
 @cindex open source

-@cindex movements, Free Software and Open Source
-
-The terms ``free software'' and ``open source'' are the slogans of two
-different movements which differ in their basic philosophy.  The Free
-Software Movement is idealistic, and raises issues of freedom, ethics,
-principle and what makes for a good society.  The Open Source Movement,
-founded in 1998, studiously avoids such questions.  For more explanation,
-see @url{http://www.gnu.org/philosophy/open-source-misses-the-point.html}.
-
-The GNU Project is aligned with the Free Software Movement.  This
+@cindex movement, free software
+@cindex development method, open source
+
+The terms ``free software'' and ``open source'', while describing
+almost the same category of software, stand for views based on
+fundamentally different values.  The free software movement is
+idealistic, and raises issues of freedom, ethics, principle and what
+makes for a good society.  The term open source, initiated in 1998, is
+associated with a philosophy which studiously avoids such questions.
+For a detailed explanation, see
+@url{http://www.gnu.org/philosophy/open-source-misses-the-point.html}.
+
+The GNU Project is aligned with the free software movement.  This

 doesn't mean that all GNU contributors and maintainers have to agree;
 your views on these issues are up to you, and you're entitled to express
 them when speaking for yourself.
 
 doesn't mean that all GNU contributors and maintainers have to agree;
 your views on these issues are up to you, and you're entitled to express
 them when speaking for yourself.
 

-However, due to the much greater publicity that the Open Source
-Movement receives, the GNU Project needs to overcome a widespread
-mistaken impression that GNU is @emph{and always was} an activity of
-the Open Source Movement.  For this reason, please use the term ``free
+However, due to the much greater publicity that the term ``open source''
+receives, the GNU Project needs to overcome a widespread
+mistaken impression that GNU is @emph{and always was} an ``open
+source'' activity.  For this reason, please use the term ``free

 software'', not ``open source'', in GNU software releases, GNU
 documentation, and announcements and articles that you publish in your
 role as the maintainer of a GNU package.  A reference to the URL given
 above, to explain the difference, is a useful thing to include as
 well.
 
 software'', not ``open source'', in GNU software releases, GNU
 documentation, and announcements and articles that you publish in your
 role as the maintainer of a GNU package.  A reference to the URL given
 above, to explain the difference, is a useful thing to include as
 well.
 

+

 @node GNU and Linux
 @section GNU and Linux
 @cindex Linux
 @node GNU and Linux
 @section GNU and Linux
 @cindex Linux


@@ -2048,15 +2125,17 @@ repository for your package, but that's not required.  @xref{Old
 Versions}, for more information about Savannah.
 
 We strongly urge you to use @code{ftp.gnu.org} as the standard
 Versions}, for more information about Savannah.
 
 We strongly urge you to use @code{ftp.gnu.org} as the standard

-distribution site.  Doing so makes it easier for developers and users
-to find the latest GNU releases.  However, it is ok to use another
-server if you wish, provided it allows access from the general public
-without limitation (for instance, without excluding any country).
+distribution site for releases.  Doing so makes it easier for
+developers and users to find the latest GNU releases.  However, it is
+ok to use another server if you wish, provided it allows access from
+the general public without limitation (for instance, without excluding
+any country).

 
 If you use a company's machine to hold the repository for your
 
 If you use a company's machine to hold the repository for your

-program, or as its ftp site, please put this statement in a prominent
-place on the site, so as to prevent people from getting the wrong idea
-about the relationship between the package and the company:
+program, or as its release distribution site, please put this
+statement in a prominent place on the site, so as to prevent people
+from getting the wrong idea about the relationship between the package
+and the company:

 
 @smallexample
 The programs <list of them> hosted here are free software packages
 
 @smallexample
 The programs <list of them> hosted here are free software packages