X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ab5796a9f97180707734a81320e3eb81937281fe..cedf175b492f299fac0e8165730472a731915248:/man/gnu.texi

diff --git a/man/gnu.texi b/man/gnu.texi
index 4185f8f911..0f216152b1 100644
--- a/man/gnu.texi
+++ b/man/gnu.texi
@@ -1,14 +1,16 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1995 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2002, 2003, 2004,
+@c   2005 Free Software Foundation, Inc.
 @ifclear justgnu
 @node Manifesto,, MS-DOS, Top
 @unnumbered The GNU Manifesto
 @end ifclear
 @ifset justgnu
-Copyright (C) 1985, 1993, 2001 Free Software Foundation, Inc.
+Copyright (C) 1985, 1993, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU
 Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
@@ -39,9 +41,10 @@ Since that time, we have learned about certain common misunderstandings
 that different wording could help avoid.  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.
+For up-to-date information about the available GNU software, please
+see @uref{http://www.gnu.org}.  For software tasks to work on, see
+@uref{http://savannah.gnu.org/projects/tasklist}.  For other ways to
+contribute, see @uref{http://www.gnu.org/help}.
 @end quotation
 
 @unnumberedsec What's GNU?  Gnu's Not Unix!
@@ -380,7 +383,17 @@ practice they would still make considerably more than that.)
 other people's lives; and it is usually used to make their lives more
 difficult.
 
-People who have studied the issue of intellectual property rights carefully
+People who have studied the issue of intellectual property
+rights@footnote{In the 80s I had not yet realized how confusing it was
+to speak of ``the issue'' of ``intellectual property.''  That term is
+obviously 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 clear is to discuss patents, copyrights, and
+trademarks separately.  See
+@uref{http://www.gnu.org/philosophy/not-ipr.xhtml} for more
+explanation of how this term spreads confusion and bias.} carefully
 (such as lawyers) say that there is no intrinsic right to intellectual
 property.  The kinds of supposed intellectual property rights that the
 government recognizes were created by specific acts of legislation for
@@ -489,9 +502,15 @@ operating systems onto the new hardware.
 The sale of teaching, hand-holding and maintenance services could also
 employ programmers.
 
-People with new ideas could distribute programs as freeware, asking for
-donations from satisfied users, or selling hand-holding services.  I have
-met people who are already working this way successfully.
+People with new ideas could distribute programs as
+freeware@footnote{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
+@uref{http://www.gnu.org/philosophy/words-to-avoid.html} for more
+explanation.}, asking for donations from satisfied users, or selling
+hand-holding services.  I have met people who are already working this
+way successfully.
 
 Users with related needs can form users' groups, and pay dues.  A group
 would contract with programming companies to write programs that the