Merge from emacs--rel--22

[bpt/emacs.git] / 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 b2fdb97..96cf365 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.1.50
+@set EMACSVER  23.0.50
 
 @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