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

diff --cc admin/FOR-RELEASE
Simple merge

diff --cc lispref/ChangeLog
Simple merge

diff --cc lispref/elisp.texi
Simple merge

diff --cc man/ChangeLog
index c3b306a,a7caf64..c4141f5
--- 1/man/ChangeLog
--- 2/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.
  

diff --cc man/emacs.texi
Simple merge