gnustandards ChangeLog maintain.texi

[Karl Berry]

CVSROOT:        /sources/gnustandards
Module name:    gnustandards
Changes by:     Karl Berry <karl>       12/05/14 22:30:01

Modified files:
        .              : ChangeLog maintain.texi 

Log message:
        url fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnustandards/ChangeLog?cvsroot=gnustandards&r1=1.161&r2=1.162
http://cvs.savannah.gnu.org/viewcvs/gnustandards/maintain.texi?cvsroot=gnustandards&r1=1.220&r2=1.221

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnustandards/gnustandards/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- ChangeLog   14 Apr 2012 21:42:23 -0000      1.161
+++ ChangeLog   14 May 2012 22:30:01 -0000      1.162
@@ -1,3 +1,12 @@
+2012-05-14  Karl Berry  <address@hidden>
+
+       * maintain.texi (GNU and Linux): url fixes from Ineiev.
+
+2012-05-13  Richard Stallman  <address@hidden>
+
+       * maintain.texi (Interviews and Speeches): new node.
+       (External Libraries): discuss licensing; avoid goffice.
+       
 2012-04-14  Richard Stallman  <address@hidden>
 
        Explain that employer can assign copyright.

Index: maintain.texi
===================================================================
RCS file: /sources/gnustandards/gnustandards/maintain.texi,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -b -r1.220 -r1.221
--- maintain.texi       13 May 2012 23:10:54 -0000      1.220
+++ maintain.texi       14 May 2012 22:30:01 -0000      1.221
@@ -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 13, 2012
address@hidden lastupdate May 14, 2012
 @c %**end of header
 
 @dircategory GNU organization
@@ -69,6 +69,7 @@
 * Web Pages::
 * Ethical and Philosophical Consideration::
 * Terminology::
+* Interviews and Speeches::
 * Hosting::
 * Donations::
 * Free Software Directory::
@@ -999,8 +1000,8 @@
 obstacle to upgrading your package's license to ``GPL version 4 or
 later''.
 
-One package you need to avoid is goffice, since it allows only GPL
-versions 2 and 3.
+One package you need to avoid is @code{goffice}, since it allows only
+GPL versions 2 and 3.
 
 It would be unreasonable to ask the author of the external module to
 assign its the copyright to the FSF.  After all, person did not write
@@ -2231,6 +2232,7 @@
 of the GNU kernel, please call it ``the Hurd'' or ``the GNU Hurd''.
 Note that this uses a space, not a slash.
 
+
 @node Interviews and Speeches
 @chapter Interviews and Speeches
 
@@ -2239,7 +2241,7 @@
 free software movement.  Please avoid saying ``open source'' and avoid
 calling the GNU system ``Linux'', just as you would in the package
 itself (@pxref{Terminology}).  Likewise, avoid promoting nonfree
-programs (@pxref{References, , References, standards, GNU Coding
+programs (@pxref{References,,, standards, GNU Coding
 Standards}) as you would in the package itself.
 
 Many GNU users have erroneous ideas about GNU.  Outside of our
@@ -2250,16 +2252,16 @@
 @itemize @bullet
 @item
 What GNU is (an operating system developed to be Unix-like and totally
-free software).  It is good to mention @url{gnu.org}.
+free software).  It is good to mention @url{http://www.gnu.org}.
 
 @item
 What free software is (the users control it, so it doesn't control
 them).  It is good to state the four freedoms and/or refer to
address@hidden/philosophy/free-sw.html}.
address@hidden://www.gnu.org/philosophy/free-sw.html}.
 
 @item
 What GNU/Linux is (Linux filled the last gap in GNU).  It is useful to
-refer to @url{gnu.org/gnu/linux-and-gnu.html}.
+refer to @url{http://www.gnu.org/gnu/linux-and-gnu.html}.
 
 @item
 What the GNU Project is (the project to develop GNU).
@@ -2285,7 +2287,7 @@
 suggesting it is any company's project.
 
 If you are paid by a company to work on the GNU package, it is
-appropriate to thank the company in a discrete way, but please don't
+appropriate to thank the company in a discreet way, but please don't
 go beyond that.
 
 Before you do a speech or interview, please contact the GNU Project