Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 227-228)

   - Update from CVS

2007-06-08  Katsumi Yamaoka  <[email protected]>

   * lisp/gnus/gnus-ems.el (gnus-x-splash): Make it work.

   * lisp/gnus/gnus-start.el (gnus-1): Relax restrictions that prevent gnus-x-splash
   from being used.

   * lisp/gnus/gnus-art.el (gnus-article-summary-command-nosave): Correct the order
   of the arguments passed to pop-to-buffer.
   (gnus-article-read-summary-keys): Ditto.

2007-06-06  Andreas Seltenreich  <[email protected]>

   * man/gnus.texi (Misc Group Stuff, Summary Buffer)
   (Server Commands, Article Keymap): Fix typo.  s/function/command/.

Revision: [email protected]/emacs--devo--0--patch-792

2 files changed, 13 insertions, 8 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 944c36bd0f..e216f6ab7c 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-06  Andreas Seltenreich  <[email protected]>
+
+	* gnus.texi (Misc Group Stuff, Summary Buffer)
+	(Server Commands, Article Keymap): Fix typo.  s/function/command/.
+
 2007-06-07  Alan Mackenzie  <[email protected]>
 
 	* display.texi (Optional Mode Line): Document the new form of
diff --git a/man/gnus.texi b/man/gnus.texi
index a3026251cb..85167d5343 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -4084,8 +4084,8 @@ happens.  You just have to be careful if you do stuff like that.
 @item v
 @kindex v (Group)
 @cindex keys, reserved for users (Group)
-The key @kbd{v} is reserved for users.  You can bind it key to some
-function or better use it as a prefix key.  For example:
+The key @kbd{v} is reserved for users.  You can bind it to some
+command or better use it as a prefix key.  For example:
 
 @lisp
 (define-key gnus-group-mode-map (kbd "v j d")
@@ -4498,8 +4498,8 @@ available in Emacs.
 
 @kindex v (Summary)
 @cindex keys, reserved for users (Summary)
-The key @kbd{v} is reserved for users.  You can bind it key to some
-function or better use it as a prefix key.  For example:
+The key @kbd{v} is reserved for users.  You can bind it to some
+command or better use it as a prefix key.  For example:
 @lisp
 (define-key gnus-summary-mode-map (kbd "v -") "LrS") ;; lower subthread
 @end lisp
@@ -11422,8 +11422,8 @@ buffer.
 
 @kindex v (Article)
 @cindex keys, reserved for users (Article)
-The key @kbd{v} is reserved for users.  You can bind it key to some
-function or better use it as a prefix key.
+The key @kbd{v} is reserved for users.  You can bind it to some
+command or better use it as a prefix key.
 
 A few additional keystrokes are available:
 
@@ -12460,8 +12460,8 @@ Also @pxref{Formatting Variables}.
 @item v
 @kindex v (Server)
 @cindex keys, reserved for users (Server)
-The key @kbd{v} is reserved for users.  You can bind it key to some
-function or better use it as a prefix key.
+The key @kbd{v} is reserved for users.  You can bind it to some
+command or better use it as a prefix key.
 
 @item a
 @kindex a (Server)