Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 8)

   - Update from CVS

2007-05-04  Karl Berry  <karl@tug.org>

   * lispref/elisp.texi (EMACSVER) [smallbook]: 22.1, not 22.

2007-05-04  Karl Berry  <karl@gnu.org>

   * man/emacs.texi (EMACSVER) [smallbook]: 22.1 for printed version, not 22.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-731

2 files changed, 5 insertions, 1 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index c3b306a0b7a..c4141f54163 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-04  Karl Berry  <karl@gnu.org>
+
+        * emacs.texi (EMACSVER) [smallbook]: 22.1 for printed version, not 22.
+
 2007-05-03  Karl Berry  <karl@gnu.org>
 
         * emacs.texi (EMACSVER) [smallbook]: 22 for printed version.
diff --git a/man/emacs.texi b/man/emacs.texi
index 54725305e1f..9086745ba66 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -51,7 +51,7 @@ Software Foundation raise funds for GNU development.''
 @tex
 @ifset smallbook
 @fonttextsize 10
-@set EMACSVER 22
+@set EMACSVER 22.1
 \global\let\urlcolor=\Black % don't print links in grayscale
 \global\let\linkcolor=\Black
 @end ifset