[Emacs-diffs] Changes to emacs/man/emacs.texi

[Lute Kamstra]

Index: emacs/man/emacs.texi
diff -c emacs/man/emacs.texi:1.98 emacs/man/emacs.texi:1.99
*** emacs/man/emacs.texi:1.98   Wed May 18 14:20:41 2005
--- emacs/man/emacs.texi        Mon May 23 09:05:38 2005
***************
*** 65,72 ****
  @sp 2
  ISBN 1-882114-06-X @*
  Published by the Free Software Foundation @*
! 59 Temple Place, Suite 330 @*
! Boston, MA  02111-1307 USA
  
  @sp 2
  Cover art by Etienne Suvasa.
--- 65,72 ----
  @sp 2
  ISBN 1-882114-06-X @*
  Published by the Free Software Foundation @*
! 51 Franklin Street, Fifth Floor @*
! Boston, MA 02110-1301 USA
  
  @sp 2
  Cover art by Etienne Suvasa.
***************
*** 951,961 ****
    GNU Emacs is a member of the Emacs editor family.  There are many Emacs
  editors, all sharing common principles of organization.  For information on
  the underlying philosophy of Emacs and the lessons learned from its
! development, write for a copy of AI memo 519a, ``Emacs, the Extensible,
! Customizable Self-Documenting Display Editor,'' to Publications Department,
  Artificial Intelligence Lab, 545 Tech Square, Cambridge, MA 02139, 
address@hidden  At
  last report they charge $2.25 per copy.  Another useful publication is LCS
! TM-165, ``A Cookbook for an Emacs,'' by Craig Finseth, available from
  Publications Department, Laboratory for Computer Science, 545 Tech Square,
  Cambridge, MA 02139, address@hidden  The price today is $3.
  
--- 951,961 ----
    GNU Emacs is a member of the Emacs editor family.  There are many Emacs
  editors, all sharing common principles of organization.  For information on
  the underlying philosophy of Emacs and the lessons learned from its
! development, write for a copy of AI memo 519a, @cite{Emacs, the Extensible,
! Customizable Self-Documenting Display Editor}, to Publications Department,
  Artificial Intelligence Lab, 545 Tech Square, Cambridge, MA 02139, 
address@hidden  At
  last report they charge $2.25 per copy.  Another useful publication is LCS
! TM-165, @cite{A Cookbook for an Emacs}, by Craig Finseth, available from
  Publications Department, Laboratory for Computer Science, 545 Tech Square,
  Cambridge, MA 02139, address@hidden  The price today is $3.
  
***************
*** 971,990 ****
  @unnumbered Distribution
  
  GNU Emacs is @dfn{free software}; this means that everyone is free to
! use it and free to redistribute it on certain conditions.  GNU Emacs is
! not in the public domain; it is copyrighted and there are restrictions
! on its distribution, but these restrictions are designed to permit
! everything that a good cooperating citizen would want to do.  What is
! not allowed is to try to prevent others from further sharing any version
! of GNU Emacs that they might get from you.  The precise conditions are
! found in the GNU General Public License that comes with Emacs and also
! appears following this section.
! 
! One way to get a copy of GNU Emacs is from someone else who has it.  You
! need not ask for our permission to do so, or tell any one else; just
! copy it.  If you have access to the Internet, you can get the latest
! distribution version of GNU Emacs by anonymous FTP; see the file
! @file{etc/FTP} in the Emacs distribution for more information.
  
  You may also receive GNU Emacs when you buy a computer.  Computer
  manufacturers are free to distribute copies on the same terms that apply to
--- 971,995 ----
  @unnumbered Distribution
  
  GNU Emacs is @dfn{free software}; this means that everyone is free to
! use it and free to redistribute it on certain conditions.  GNU Emacs
! is not in the public domain; it is copyrighted and there are
! restrictions on its distribution, but these restrictions are designed
! to permit everything that a good cooperating citizen would want to do.
! What is not allowed is to try to prevent others from further sharing
! any version of GNU Emacs that they might get from you.  The precise
! conditions are found in the GNU General Public License that comes with
! Emacs and also appears in this address@hidden manual is itself
! covered by the GNU Free Documentation License.  This license is
! similar in spirit to the General Public License, but is more suitable
! for documentation.  @xref{GNU Free Documentation License}.}.
! @xref{Copying}.
! 
! One way to get a copy of GNU Emacs is from someone else who has it.
! You need not ask for our permission to do so, or tell any one else;
! just copy it.  If you have access to the Internet, you can get the
! latest distribution version of GNU Emacs by anonymous FTP; see
! @url{http://www.gnu.org/software/emacs} on our website for more
! information.
  
  You may also receive GNU Emacs when you buy a computer.  Computer
  manufacturers are free to distribute copies on the same terms that apply to
***************
*** 995,1011 ****
  when you get it, not just free for the manufacturer.
  
  You can also order copies of GNU Emacs from the Free Software
! Foundation.  This is a convenient and reliable way to get a copy; it
! is also a good way to help fund our work.  (The Foundation has always
! received most of its funds in this way.)  An order form is included in
! the file @file{etc/ORDERS} in the Emacs distribution, and on our web
! site in @url{http://www.gnu.org/order/order.html}.  For further
! information, write to
  
  @display
  Free Software Foundation
! 59 Temple Place, Suite 330
! Boston, MA  02111-1307 USA
  USA
  @end display
  
--- 1000,1016 ----
  when you get it, not just free for the manufacturer.
  
  You can also order copies of GNU Emacs from the Free Software
! Foundation.  This is a convenient and reliable way to get a copy; it is
! also a good way to help fund our work.  We also sell hardcopy versions
! of this manual and @cite{An Introduction to Programming in Emacs Lisp},
! by Robert J. Chassell.  You can find an order form on our web site at
! @url{http://www.gnu.org/order/order.html}.  For further information,
! write to
  
  @display
  Free Software Foundation
! 51 Franklin Street, Fifth Floor
! Boston, MA 02110-1301
  USA
  @end display
  
***************
*** 1137,1146 ****
  separate copy of all of Emacs.  Most of the editing commands of Emacs
  are written in Lisp; the few exceptions could have been written
  in Lisp but are written in C for efficiency.  Although only a programmer
! can write an extension, anybody can use it afterward.  If you want to
! learn Emacs Lisp programming, we recommend the @cite{Introduction to
! Emacs Lisp} by Robert J. Chassell, also published by the Free Software
! Foundation.
  
     When run under the X Window System, Emacs provides its own menus and
  convenient bindings to mouse buttons.  But Emacs can provide many of the
--- 1142,1150 ----
  separate copy of all of Emacs.  Most of the editing commands of Emacs
  are written in Lisp; the few exceptions could have been written
  in Lisp but are written in C for efficiency.  Although only a programmer
! can write an extension, anybody can use it afterward.  @xref{Top,
! Emacs Lisp Intro, Preface, eintr, An Introduction to Programming in
! Emacs Lisp}, if you want to learn Emacs Lisp programming.
  
     When run under the X Window System, Emacs provides its own menus and
  convenient bindings to mouse buttons.  But Emacs can provide many of the
***************
*** 1189,1195 ****
  
  @display
  Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
! 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
--- 1193,1199 ----
  
  @display
  Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
! 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
***************
*** 1535,1541 ****
  
  You should have received a copy of the GNU General Public License along
  with this program; if not, write to the Free Software Foundation, Inc.,
! 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  @end smallexample
  
  Also add information on how to contact you by electronic and paper mail.
--- 1539,1545 ----
  
  You should have received a copy of the GNU General Public License along
  with this program; if not, write to the Free Software Foundation, Inc.,
! 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  @end smallexample
  
  Also add information on how to contact you by electronic and paper mail.