[Emacs-diffs] Changes to emacs/etc/emacs.1

[Juanma Barranquero]

Index: emacs/etc/emacs.1
diff -c emacs/etc/emacs.1:1.9 emacs/etc/emacs.1:1.10
*** emacs/etc/emacs.1:1.9       Mon Jul 29 13:30:57 2002
--- emacs/etc/emacs.1   Tue Feb  4 09:30:41 2003
***************
*** 32,40 ****
  .br
  .SH DESCRIPTION
  .I GNU Emacs
! is a version of 
  .I Emacs,
! written by the author of the original (PDP-10) 
  .I Emacs,
  Richard Stallman.
  .br
--- 32,40 ----
  .br
  .SH DESCRIPTION
  .I GNU Emacs
! is a version of
  .I Emacs,
! written by the author of the original (PDP-10)
  .I Emacs,
  Richard Stallman.
  .br
***************
*** 46,53 ****
  page takes away from other more useful projects.
  .br
  The user functionality of GNU Emacs encompasses
! everything other 
! .I Emacs 
  editors do, and it is easily extensible since its
  editing commands are written in Lisp.
  .PP
--- 46,53 ----
  page takes away from other more useful projects.
  .br
  The user functionality of GNU Emacs encompasses
! everything other
! .I Emacs
  editors do, and it is easily extensible since its
  editing commands are written in Lisp.
  .PP
***************
*** 58,65 ****
  windows and buffers.
  CTRL-h or F1 enters the Help facility.  Help Tutorial (CTRL-h t)
  requests an interactive tutorial which can teach beginners the fundamentals
! of 
! .I Emacs 
  in a few minutes.
  Help Apropos (CTRL-h a) helps you
  find a command given its functionality, Help Character (CTRL-h c)
--- 58,65 ----
  windows and buffers.
  CTRL-h or F1 enters the Help facility.  Help Tutorial (CTRL-h t)
  requests an interactive tutorial which can teach beginners the fundamentals
! of
! .I Emacs
  in a few minutes.
  Help Apropos (CTRL-h a) helps you
  find a command given its functionality, Help Character (CTRL-h c)
***************
*** 114,120 ****
  Do not load the site-wide startup file.
  .TP
  .BI \-debug-init
! Enable 
  .I Emacs
  Lisp debugger during the processing of the user init file
  .BI ~/.emacs.
--- 114,120 ----
  Do not load the site-wide startup file.
  .TP
  .BI \-debug-init
! Enable
  .I Emacs
  Lisp debugger during the processing of the user init file
  .BI ~/.emacs.
***************
*** 161,174 ****
  options to specify files to execute and functions to call.
  .TP
  .B \-kill
! Exit 
! .I Emacs 
  while in batch mode.
  .TP
  .BI \-L " directory"
  Add
  .I directory
! to the list of directories 
  .I Emacs
  searches for Lisp files.
  .\" START DELETING HERE IF YOU'RE NOT USING X
--- 161,174 ----
  options to specify files to execute and functions to call.
  .TP
  .B \-kill
! Exit
! .I Emacs
  while in batch mode.
  .TP
  .BI \-L " directory"
  Add
  .I directory
! to the list of directories
  .I Emacs
  searches for Lisp files.
  .\" START DELETING HERE IF YOU'RE NOT USING X
***************
*** 240,246 ****
  .TP
  .BI \-ib " pixels"
  Set the window's internal border width to the number of pixels specified
! by 
  .I pixels.
  Defaults to one pixel of padding on each side of the window.
  .PP
--- 240,246 ----
  .TP
  .BI \-ib " pixels"
  Set the window's internal border width to the number of pixels specified
! by
  .I pixels.
  Defaults to one pixel of padding on each side of the window.
  .PP
***************
*** 384,390 ****
  the border color will be set to grey,
  and the text and mouse cursors will be set to black.
  .PP
! .SM Using the Mouse 
  .PP
  The following lists the mouse button bindings for the
  .I Emacs
--- 384,390 ----
  the border color will be set to grey,
  and the text and mouse cursors will be set to black.
  .PP
! .SM Using the Mouse
  .PP
  The following lists the mouse button bindings for the
  .I Emacs
***************
*** 400,412 ****
  SHIFT-right   Paste text.
  CTRL-middle   Cut text into X cut buffer and kill it.
  CTRL-right    T{
! Select this window, then split it into 
  two windows.  Same as typing CTRL-x 2.
  T}
  .\" START DELETING HERE IF YOU'RE NOT USING X MENUS
  CTRL-SHIFT-left       T{
  X buffer menu--hold the buttons and keys
! down, wait for menu to appear, select 
  buffer, and release.  Move mouse out of
  menu and release to cancel.
  T}
--- 400,412 ----
  SHIFT-right   Paste text.
  CTRL-middle   Cut text into X cut buffer and kill it.
  CTRL-right    T{
! Select this window, then split it into
  two windows.  Same as typing CTRL-x 2.
  T}
  .\" START DELETING HERE IF YOU'RE NOT USING X MENUS
  CTRL-SHIFT-left       T{
  X buffer menu--hold the buttons and keys
! down, wait for menu to appear, select
  buffer, and release.  Move mouse out of
  menu and release to cancel.
  T}
***************
*** 440,446 ****
  /usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files
  that define most editing commands.  Some are preloaded;
  others are autoloaded from this directory when used.
!   
  /usr/local/share/emacs/$VERSION/etc - various programs that are used with
  GNU Emacs, and some files of information.
  
--- 440,446 ----
  /usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files
  that define most editing commands.  Some are preloaded;
  others are autoloaded from this directory when used.
! 
  /usr/local/share/emacs/$VERSION/etc - various programs that are used with
  GNU Emacs, and some files of information.
  
***************
*** 495,509 ****
  running in Raw mode on some Unix versions.
  .SH UNRESTRICTIONS
  .PP
! .I Emacs 
! is free; anyone may redistribute copies of 
! .I Emacs 
  to
! anyone under the terms stated in the 
! .I Emacs 
  General Public License,
! a copy of which accompanies each copy of 
! .I Emacs 
  and which also
  appears in the reference manual.
  .PP
--- 495,509 ----
  running in Raw mode on some Unix versions.
  .SH UNRESTRICTIONS
  .PP
! .I Emacs
! is free; anyone may redistribute copies of
! .I Emacs
  to
! anyone under the terms stated in the
! .I Emacs
  General Public License,
! a copy of which accompanies each copy of
! .I Emacs
  and which also
  appears in the reference manual.
  .PP
***************
*** 514,524 ****
  systems.  Such inclusion violates the terms on which distribution
  is permitted.  In fact, the primary purpose of the General Public
  License is to prohibit anyone from attaching any other restrictions
! to redistribution of 
  .I Emacs.
  .PP
! Richard Stallman encourages you to improve and extend 
! .I Emacs, 
  and urges that
  you contribute your extensions to the GNU library.  Eventually GNU
  (Gnu's Not Unix) will be a complete replacement for Berkeley
--- 514,524 ----
  systems.  Such inclusion violates the terms on which distribution
  is permitted.  In fact, the primary purpose of the General Public
  License is to prohibit anyone from attaching any other restrictions
! to redistribution of
  .I Emacs.
  .PP
! Richard Stallman encourages you to improve and extend
! .I Emacs,
  and urges that
  you contribute your extensions to the GNU library.  Eventually GNU
  (Gnu's Not Unix) will be a complete replacement for Berkeley
***************
*** 532,538 ****
  was written by Richard Stallman and the Free Software Foundation.
  Joachim Martillo and Robert Krawitz added the X features.
  .SH COPYING
! Copyright 
  .if t \(co
  .if n (c)
  1995, 1999, 2000, 2001 Free Software Foundation, Inc.
--- 532,538 ----
  was written by Richard Stallman and the Free Software Foundation.
  Joachim Martillo and Robert Krawitz added the X features.
  .SH COPYING
! Copyright
  .if t \(co
  .if n (c)
  1995, 1999, 2000, 2001 Free Software Foundation, Inc.