Merge from emacs--rel--22

[gnu-emacs] / doc / emacs / emacs.texi

diff --git a/man/emacs.texi b/doc/emacs/emacs.texi
similarity index 99%
rename from man/emacs.texi
rename to doc/emacs/emacs.texi
index 6b1510d136e37d982a610823d3216ce1723ed0f1..28b72eb5c136bba4aaed44b317f01f752999770b 100644 (file)
--- a/man/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1,11 +1,11 @@
 \input texinfo
 
-@setfilename ../info/emacs
+@setfilename ../../info/emacs
 @settitle GNU Emacs Manual
 
 @c The edition number appears in several places in this file
 @set EDITION   Sixteenth
-@set EMACSVER  22.2.50
+@set EMACSVER  23.0.60
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
@@ -51,7 +51,7 @@ developing GNU and promoting software freedom.''
 @tex
 @ifset smallbook
 @fonttextsize 10
-@set EMACSVER 22.1
+@set EMACSVER 22
 \global\let\urlcolor=\Black % don't print links in grayscale
 \global\let\linkcolor=\Black
 @end ifset
@@ -302,11 +302,9 @@ Help
 The Mark and the Region
 
 * Setting Mark::       Commands to set the mark.
-* Transient Mark::     How to make Emacs highlight the region--
-                         when there is one.
-* Momentary Mark::      Enabling Transient Mark mode momentarily.
-* Using Region::       Summary of ways to operate on contents of the region.
 * Marking Objects::    Commands to put region around textual units.
+* Using Region::       Summary of ways to operate on contents of the region.
+* Persistent Mark::    Keeping the mark active all the time.
 * Mark Ring::          Previous mark positions saved so you can go back there.
 * Global Mark Ring::   Previous mark positions in various buffers.
 
@@ -460,7 +458,7 @@ Version Control
 * Introduction to VC::  How version control works in general.
 * VC Mode Line::        How the mode line shows version control status.
 * Basic VC Editing::    How to edit a file under version control.
-* Old Versions::        Examining and comparing old versions.
+* Old Revisions::       Examining and comparing old revisions of files.
 * Secondary VC Commands:: The commands used a little less frequently.
 * Branches::            Multiple lines of development.
 * Remote Repositories:: Efficient access to remote CVS servers.