From: Miles Bader <miles@gnu.org>
Date: Fri, 4 May 2007 23:08:42 +0000 (+0000)
Subject: Merge from emacs--rel--22
X-Git-Tag: emacs-pretest-23.0.90~12730
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ab23894e92cab52154c770558d648b2d9cf8b8ee;p=emacs.git

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
---

ab23894e92cab52154c770558d648b2d9cf8b8ee
diff --cc man/ChangeLog
index c3b306a0b7a,a7caf64f195..c4141f54163
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@@ -1,4 -1,8 +1,8 @@@
 -2007-05-04  Karl Berry  <karl@tug.org>
++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@tug.org>
 +2007-05-03  Karl Berry  <karl@gnu.org>
  
  	* emacs.texi (EMACSVER) [smallbook]: 22 for printed version.