diff options
| author | Richard M. Stallman | 2005-05-15 13:49:41 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-05-15 13:49:41 +0000 |
| commit | 820f92e199756d240b94ae9e646440f307df8a4d (patch) | |
| tree | 0f2568618fc8a05aab9fd9a8f9eee9ec96870292 | |
| parent | fcd6e6018b8f5b19327a20e0695a1825d7512e74 (diff) | |
| download | emacs-820f92e199756d240b94ae9e646440f307df8a4d.tar.gz emacs-820f92e199756d240b94ae9e646440f307df8a4d.zip | |
Correct/improve previous change.
| -rw-r--r-- | etc/ChangeLog | 4 | ||||
| -rw-r--r-- | etc/GNU | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 0d4f9750620..cf498d60c24 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2005-05-15 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * GNU: Correct/improve previous change. | ||
| 4 | |||
| 1 | 2005-05-14 Richard M. Stallman <rms@gnu.org> | 5 | 2005-05-14 Richard M. Stallman <rms@gnu.org> |
| 2 | 6 | ||
| 3 | * GNU: Update footnotes. | 7 | * GNU: Update footnotes. |
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 1985, 1993, 2003 Free Software Foundation, Inc. | 1 | Copyright (C) 1985, 1993, 2003, 2005 Free Software Foundation, Inc. |
| 2 | 2 | ||
| 3 | Permission is granted to anyone to make or distribute verbatim copies | 3 | Permission is granted to anyone to make or distribute verbatim copies |
| 4 | of this document, in any medium, provided that the copyright notice and | 4 | of this document, in any medium, provided that the copyright notice and |
| @@ -518,7 +518,7 @@ friends or over the net. But it does suggest the wrong idea. | |||
| 518 | 518 | ||
| 519 | (3) Several such companies now exist. | 519 | (3) Several such companies now exist. |
| 520 | 520 | ||
| 521 | (4) The Free Software Foundation raisesd most of its funds for 10 | 521 | (4) The Free Software Foundation raised most of its funds for 10 |
| 522 | years from a distribution service, although it is a charity rather | 522 | years from a distribution service, although it is a charity rather |
| 523 | than a company. | 523 | than a company. |
| 524 | 524 | ||
| @@ -535,9 +535,9 @@ clear is to to discuss patents, copyrights, and trademarks separately. | |||
| 535 | See http://www.gnu.org/philosophy/not-ipr.xhtml for more explanation | 535 | See http://www.gnu.org/philosophy/not-ipr.xhtml for more explanation |
| 536 | of how this term spreads confusion and bias. | 536 | of how this term spreads confusion and bias. |
| 537 | 537 | ||
| 538 | (7) In 1985 I had not yet recognize it is important to distinguish | 538 | (7) In 1985 I had not yet recognized the importance of distinguishing |
| 539 | clearly between "free software" and "freeware". The term "freeware" | 539 | between "free software" and "freeware". The term "freeware" means |
| 540 | means you are free to redistribute the software--but not necessarily | 540 | software you are free to redistribute, but usually you are not free to study |
| 541 | free to study and change the source code. So it is not the same as | 541 | and change the source code, so most of it is not free software. |
| 542 | free software. See http://www.gnu.org/philosophy/words-to-avoid.html | 542 | See http://www.gnu.org/philosophy/words-to-avoid.html for more |
| 543 | for more explanation. | 543 | explanation. |