Merge from gnus--devo--0

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

2 files changed, 7 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e89a7e31ec0..65f8a57c4fd 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-coding.texi (Gnus Maintainance Guide): Update conventions for
+        custom versions.
+
 2008-03-07  Alan Mackenzie  <acm@muc.de>
 
         * cc-mode.texi (Limitations and Known Bugs): State that the number of
diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi
index b6dc3148da2..3b0df9fb322 100644
--- a/doc/misc/gnus-coding.texi
+++ b/doc/misc/gnus-coding.texi
@@ -256,7 +256,7 @@ changes.  Only after a new major release, e.g. 5.10.1, there's usually a
 feature period of several months.  After the release of Gnus 5.10.6 the
 development of new features started again on the trunk while the 5.10
 series is continued on the stable branch (v5-10) from which more stable
-releases will be done when needed (5.10.7, @dots{}).
+releases will be done when needed (5.10.8, @dots{}).
 @ref{Gnus Development, ,Gnus Development, gnus, The Gnus Newsreader}
 
 Stable releases of Gnus finally become part of Emacs.  E.g. Gnus 5.8
@@ -366,7 +366,7 @@ v5-10 branch) use @code{:version "22.1" ;; Oort Gnus} (including the
 comment) or e.g. @code{:version "22.2" ;; Gnus 5.10.10} if the feature
 was added for Emacs 22.2 and Gnus 5.10.10.
 @c
-If the variable is new in No Gnus use @code{:version "23.0" ;; No Gnus}.
+If the variable is new in No Gnus use @code{:version "23.1" ;; No Gnus}.
 
 The same applies for customizable variables when its default value was
 changed.