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

[Michael Kifer]

Index: emacs/man/ediff.texi
diff -c emacs/man/ediff.texi:1.20 emacs/man/ediff.texi:1.21
*** emacs/man/ediff.texi:1.20   Sun Aug 19 21:15:42 2001
--- emacs/man/ediff.texi        Mon Dec 24 00:50:31 2001
***************
*** 27,33 ****
  @comment %**end of header (This is for running Texinfo on a region.)
  
  @ifinfo
! This file documents Ediff, a comprehensive visual interface to diff
  and patch utilities.
  
  Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, 
Inc.
--- 27,33 ----
  @comment %**end of header (This is for running Texinfo on a region.)
  
  @ifinfo
! This file documents Ediff, a comprehensive visual interface to Unix diff
  and patch utilities.
  
  Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, 
Inc.
***************
*** 123,129 ****
  allow the user to conveniently launch browsing or merging sessions on
  groups of files in two (or three) different directories.
  
! In addition, Ediff can apply a patch to a file and then let you step though
  both files, the patched and the original one, simultaneously,
  difference-by-difference.  You can even apply a patch right out of a mail
  buffer, i.e., patches received by mail don't even have to be saved.  Since
--- 123,129 ----
  allow the user to conveniently launch browsing or merging sessions on
  groups of files in two (or three) different directories.
  
! In addition, Ediff can apply a patch to a file and then let you step through
  both files, the patched and the original one, simultaneously,
  difference-by-difference.  You can even apply a patch right out of a mail
  buffer, i.e., patches received by mail don't even have to be saved.  Since
***************
*** 1071,1077 ****
  this variable globally.
  
  @cindex Multi-file patches
! A multi-file patch is a concatenated output of several runs of the
  @code{diff} command (some versions of @code{diff} let you create a
  multi-file patch in just one run).  Ediff facilitates creation of
  multi-file patches as follows.  If you are in a session group buffer
--- 1071,1077 ----
  this variable globally.
  
  @cindex Multi-file patches
! A multi-file patch is a concatenated output of several runs of the Unix
  @code{diff} command (some versions of @code{diff} let you create a
  multi-file patch in just one run).  Ediff facilitates creation of
  multi-file patches as follows.  If you are in a session group buffer
***************
*** 1821,1828 ****
  @vindex ediff-coding-system-for-read
  This variable specifies the coding system to use when reading the output
  that the programs @code{diff3} and @code{diff} send to Emacs. The default
! is @code{raw-text}, and this should work fine on GNU, Unix, and in most
! cases under Windows NT/95/98/2000.  There are @code{diff} programs
  for which the default option doesn't work under Windows. In such cases,
  @code{raw-text-dos} might work. If not, you will have to experiment with
  other coding systems or use GNU diff.
--- 1821,1828 ----
  @vindex ediff-coding-system-for-read
  This variable specifies the coding system to use when reading the output
  that the programs @code{diff3} and @code{diff} send to Emacs. The default
! is @code{raw-text}, and this should work fine in Unix and in most
! cases under Windows NT/95/98/2000. There are @code{diff} programs
  for which the default option doesn't work under Windows. In such cases,
  @code{raw-text-dos} might work. If not, you will have to experiment with
  other coding systems or use GNU diff.