* doc/misc/info.texi (Create Info buffer): Mention info-display-manual.

[bpt/emacs.git] / etc / GNU

diff --git a/etc/GNU b/etc/GNU
index 489afb8..45f3646 100644 (file)
--- a/etc/GNU
+++ b/etc/GNU
@@ -1,4 +1,4 @@
-Copyright (C) 1985, 1993, 2003 Free Software Foundation, Inc.
+Copyright (C) 1985, 1993, 2001-2012  Free Software Foundation, Inc.

 
    Permission is granted to anyone to make or distribute verbatim copies
 of this document, in any medium, provided that the copyright notice and
 
    Permission is granted to anyone to make or distribute verbatim copies
 of this document, in any medium, provided that the copyright notice and


@@ -22,8 +22,9 @@ The GNU Manifesto
      Footnotes added in 1993 help clarify these points.
 
      For up-to-date information about the available GNU software,
      Footnotes added in 1993 help clarify these points.
 
      For up-to-date information about the available GNU software,

-     please see the latest issue of the GNU's Bulletin.  The list is
-     much too long to include here.
+     please see www.gnu.org.  For software tasks to work on, see
+     http://savannah.gnu.org/projects/tasklist.  For other ways
+     to contribute, see http://www.gnu.org/help.

 
 What's GNU?  Gnu's Not Unix!
 ============================
 
 What's GNU?  Gnu's Not Unix!
 ============================


@@ -446,7 +447,7 @@ operating systems onto the new hardware.
    The sale of teaching, hand-holding and maintenance services could
 also employ programmers.
 
    The sale of teaching, hand-holding and maintenance services could
 also employ programmers.
 

-   People with new ideas could distribute programs as freeware, asking
+   People with new ideas could distribute programs as freeware(7), asking

 for donations from satisfied users, or selling hand-holding services.
 I have met people who are already working this way successfully.
 
 for donations from satisfied users, or selling hand-holding services.
 I have met people who are already working this way successfully.
 


@@ -518,7 +519,7 @@ friends or over the net.  But it does suggest the wrong idea.
 
    (3)  Several such companies now exist.
 
 
    (3)  Several such companies now exist.
 

-   (4)  The Free Software Foundation raisesd most of its funds for 10
+   (4)  The Free Software Foundation raised most of its funds for 10

 years from a distribution service, although it is a charity rather
 than a company.
 
 years from a distribution service, although it is a charity rather
 than a company.
 


@@ -531,6 +532,13 @@ biased; more subtle is the fact that it lumps together various
 disparate laws which raise very different issues.  Nowadays I urge
 people to reject the term "intellectual property" entirely, lest it
 lead others to suppose that those laws form one coherent issue.  The way to be
 disparate laws which raise very different issues.  Nowadays I urge
 people to reject the term "intellectual property" entirely, lest it
 lead others to suppose that those laws form one coherent issue.  The way to be

-clear is to to discuss patents, copyrights, and trademarks separately.
+clear is to discuss patents, copyrights, and trademarks separately.

 See http://www.gnu.org/philosophy/not-ipr.xhtml for more explanation
 of how this term spreads confusion and bias.
 See http://www.gnu.org/philosophy/not-ipr.xhtml for more explanation
 of how this term spreads confusion and bias.

+
+   (7) Subsequently we have learned to distinguish between "free
+software" and "freeware".  The term "freeware" means software you are
+free to redistribute, but usually you are not free to study and change
+the source code, so most of it is not free software.  See
+http://www.gnu.org/philosophy/words-to-avoid.html for more
+explanation.