gnustandards ChangeLog maintain.texi

[Karl Berry]

CVSROOT:        /sources/gnustandards
Module name:    gnustandards
Changes by:     Karl Berry <karl>       11/06/30 17:24:19

Modified files:
        .              : ChangeLog maintain.texi 

Log message:
        wording to correspond with current 
http://www.gnu.org/philosophy/open-source-misses-the-point.html; sv username to 
ftp-upload

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnustandards/ChangeLog?cvsroot=gnustandards&r1=1.138&r2=1.139
http://cvs.savannah.gnu.org/viewcvs/gnustandards/maintain.texi?cvsroot=gnustandards&r1=1.200&r2=1.201

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnustandards/gnustandards/ChangeLog,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- ChangeLog   23 Jun 2011 16:14:35 -0000      1.138
+++ ChangeLog   30 Jun 2011 17:24:19 -0000      1.139
@@ -1,3 +1,11 @@
+2011-06-30  Karl Berry  <address@hidden>
+
+       * maintain.texi (Free Software and Open Source): Open Source
+       is not a movement; reword.
+
+       * maintain.texi (Automated Upload Registration): include sv
+       username in ftp-upload mail.
+
 2011-05-10  Karl Berry  <address@hidden>
 
        * standards.texi (Semantics): remove the (new) sentence about libiconv

Index: maintain.texi
===================================================================
RCS file: /sources/gnustandards/gnustandards/maintain.texi,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- maintain.texi       9 May 2011 18:05:21 -0000       1.200
+++ maintain.texi       30 Jun 2011 17:24:19 -0000      1.201
@@ -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 May 9, 2011
address@hidden lastupdate June 30, 2011
 @c %**end of header
 
 @dircategory GNU organization
@@ -1426,8 +1426,8 @@
 
 @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
 An ASCII armored copy of your GPG key, as an attachment.  (@samp{gpg
@@ -2041,32 +2041,36 @@
 
 @node Free Software and Open Source
 @section Free Software and Open Source
address@hidden free software
address@hidden free software movement
 @cindex open source
address@hidden movements, Free Software and Open Source
address@hidden movement, free software
address@hidden development method, 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 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
address@hidden://www.gnu.org/philosophy/open-source-misses-the-point.html}.
 
-The GNU Project is aligned with the Free Software Movement.  This
+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.
 
-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.
 
+
 @node GNU and Linux
 @section GNU and Linux
 @cindex Linux