[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnustandards standards.texi
From: |
Richard M. Stallman |
Subject: |
gnustandards standards.texi |
Date: |
Sun, 25 Nov 2012 02:59:27 +0000 |
CVSROOT: /sources/gnustandards
Module name: gnustandards
Changes by: Richard M. Stallman <rms> 12/11/25 02:59:27
Modified files:
. : standards.texi
Log message:
Always indicate which GPL versions are allowed.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnustandards/standards.texi?cvsroot=gnustandards&r1=1.219&r2=1.220
Patches:
Index: standards.texi
===================================================================
RCS file: /sources/gnustandards/gnustandards/standards.texi,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -b -r1.219 -r1.220
--- standards.texi 27 Oct 2012 18:59:59 -0000 1.219
+++ standards.texi 25 Nov 2012 02:59:27 -0000 1.220
@@ -3,7 +3,7 @@
@setfilename standards.info
@settitle GNU Coding Standards
@c This date is automagically updated when you save this file:
address@hidden lastupdate October 27, 2012
address@hidden lastupdate November 24, 2012
@c %**end of header
@dircategory GNU organization
@@ -141,11 +141,18 @@
avoids legal difficulties, and other related issues.
@menu
+* License:: The license for your code and documentation.
* Reading Non-Free Code:: Referring to proprietary programs.
* Contributions:: Accepting contributions.
* Trademarks:: How we deal with trademark issues.
@end menu
address@hidden License
address@hidden The
address@hidden proprietary programs
address@hidden avoiding proprietary code
+
+
@node Reading Non-Free Code
@section Referring to Proprietary Programs
@cindex proprietary programs
@@ -1047,7 +1054,8 @@
Finally, here is the table of our suggested license abbreviations.
Any abbreviation can be followed by @address@hidden, meaning
that particular version, or later versions with the @samp{+}, as shown
-above.
+above. In the case of a GNU license, @emph{always} indicate the permitted
+versions in this way.
In the case of exceptions for extra permissions with the GPL, we use
@samp{/} for a separator; the version number can follow the license
- gnustandards standards.texi,
Richard M. Stallman <=