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/lispref/ChangeLog b/lispref/ChangeLog
index 5def92daa6f..5ebee61ecf2 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-04  Karl Berry  <karl@tug.org>
+
+        * elisp.texi (EMACSVER) [smallbook]: 22.1, not 22.
+
 2007-05-04  Eli Zaretskii  <eliz@gnu.org>
 
         * tips.texi (Documentation Tips): Rearrange items to place the
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 5d73a38e3fc..2f4a5f0e09d 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -29,7 +29,7 @@
 @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