aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2003-09-22 15:48:36 +0000
committerRichard M. Stallman2003-09-22 15:48:36 +0000
commitad709ece356b4e343238ae59c3885a91dd7edb48 (patch)
tree35063dfdd9d83a8aa3f7cd97fcca72f5ff243974
parente2f140c85826abff6812397c29a831af05d154f1 (diff)
downloademacs-ad709ece356b4e343238ae59c3885a91dd7edb48.tar.gz
emacs-ad709ece356b4e343238ae59c3885a91dd7edb48.zip
(Acknowledgements): New node, split from Distribution.
-rw-r--r--man/emacs.texi16
1 files changed, 9 insertions, 7 deletions
diff --git a/man/emacs.texi b/man/emacs.texi
index 6f42f53e8d4..2d4496ab342 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -115,6 +115,7 @@ and Sending Mail and Registers and Minibuffer.
115 115
116@menu 116@menu
117* Distrib:: How to get the latest Emacs distribution. 117* Distrib:: How to get the latest Emacs distribution.
118* Acknowledgements:: Contributors to GNU Emacs.
118* Copying:: The GNU General Public License gives you permission 119* Copying:: The GNU General Public License gives you permission
119 to redistribute GNU Emacs on certain terms; 120 to redistribute GNU Emacs on certain terms;
120 it also explains that there is no warranty. 121 it also explains that there is no warranty.
@@ -901,7 +902,7 @@ all GNU Emacs features. We don't try to describe VMS usage in this
901manual. @xref{MS-DOS}, for information about using Emacs on MS-DOS. 902manual. @xref{MS-DOS}, for information about using Emacs on MS-DOS.
902@end iftex 903@end iftex
903 904
904@node Distrib, Copying, Top, Top 905@node Distrib, Acknowledgements, Top, Top
905@unnumbered Distribution 906@unnumbered Distribution
906 907
907GNU Emacs is @dfn{free software}; this means that everyone is free to 908GNU Emacs is @dfn{free software}; this means that everyone is free to
@@ -928,9 +929,9 @@ redistribute the GNU Emacs received from them under the usual terms of the
928General Public License. In other words, the program must be free for you 929General Public License. In other words, the program must be free for you
929when you get it, not just free for the manufacturer. 930when you get it, not just free for the manufacturer.
930 931
931You can also order copies of GNU Emacs from the Free Software Foundation 932You can also order copies of GNU Emacs from the Free Software
932on CD-ROM@. This is a convenient and reliable way to get a copy; it is 933Foundation. This is a convenient and reliable way to get a copy; it
933also a good way to help fund our work. (The Foundation has always 934is also a good way to help fund our work. (The Foundation has always
934received most of its funds in this way.) An order form is included in 935received most of its funds in this way.) An order form is included in
935the file @file{etc/ORDERS} in the Emacs distribution, and on our web 936the file @file{etc/ORDERS} in the Emacs distribution, and on our web
936site in @url{http://www.gnu.org/order/order.html}. For further 937site in @url{http://www.gnu.org/order/order.html}. For further
@@ -955,7 +956,9 @@ company policy is unsympathetic to the idea of donating to charity, you
955might instead suggest ordering a CD-ROM from the Foundation 956might instead suggest ordering a CD-ROM from the Foundation
956occasionally, or subscribing to periodic updates. 957occasionally, or subscribing to periodic updates.
957 958
958@iftex 959@node Acknowledgements, Copying, Distrib, Top
960@section Acknowledgements
961
959Contributors to GNU Emacs include Per Abrahamsen, Jay K. Adams, Joe 962Contributors to GNU Emacs include Per Abrahamsen, Jay K. Adams, Joe
960Arceneaux, Boaz Ben-Zvi, Jim Blandy, Terrence Brannon, Frank Bresz, 963Arceneaux, Boaz Ben-Zvi, Jim Blandy, Terrence Brannon, Frank Bresz,
961Peter Breton, Kevin Broadey, Vincent Broman, David M. Brown, Bill 964Peter Breton, Kevin Broadey, Vincent Broman, David M. Brown, Bill
@@ -997,9 +1000,8 @@ Warsaw, Morten Welinder, Joseph Brian Wells, Rodney Whitby, Ed
997Wilkinson, Mike Williams, Steven A. Wood, Dale R. Worley, Felix 1000Wilkinson, Mike Williams, Steven A. Wood, Dale R. Worley, Felix
998S. T. Wu, Tom Wurgler, Eli Zaretskii, Jamie Zawinski, Ian T. Zimmermann, 1001S. T. Wu, Tom Wurgler, Eli Zaretskii, Jamie Zawinski, Ian T. Zimmermann,
999Reto Zimmermann, and Neal Ziring. 1002Reto Zimmermann, and Neal Ziring.
1000@end iftex
1001 1003
1002@node Copying, GNU Free Documentation License, Distrib, Top 1004@node Copying, GNU Free Documentation License, Acknowledgements, Top
1003@unnumbered GNU GENERAL PUBLIC LICENSE 1005@unnumbered GNU GENERAL PUBLIC LICENSE
1004@center Version 2, June 1991 1006@center Version 2, June 1991
1005 1007