# HG changeset patch # User Katsumi Yamaoka # Date 1271633217 0 # Node ID d5fae6429937aad9efd486ecd52c824174a0c8fd # Parent d7b6f0f1d15024f99e332a45c7719733d672a6cd# Parent 7d805250c222f7002a6dd7c1ab1881ed9762b7a3 Merge from mainline. diff -r d7b6f0f1d150 -r d5fae6429937 doc/misc/ChangeLog --- a/doc/misc/ChangeLog Sun Apr 18 23:14:41 2010 +0000 +++ b/doc/misc/ChangeLog Sun Apr 18 23:26:57 2010 +0000 @@ -1,3 +1,11 @@ +2010-04-17 Teodor Zlatanov + + * gnus.texi (Gnus Versions, Oort Gnus): Mention the Git repo instead of + the CVS repo. Put the Git repo in the news section. + + * gnus-coding.texi (Gnus Maintainance Guide): Fixed title typo. + Removed some mentions of CVS. Mention the new Git repo. + 2010-04-15 Andreas Seltenreich * gnus.texi (Score File Format): Fix typo. Reported by Štěpán Němec. diff -r d7b6f0f1d150 -r d5fae6429937 doc/misc/gnus-coding.texi --- a/doc/misc/gnus-coding.texi Sun Apr 18 23:14:41 2010 +0000 +++ b/doc/misc/gnus-coding.texi Sun Apr 18 23:26:57 2010 +0000 @@ -32,16 +32,16 @@ @titlepage -@title Gnus Coding Style and Maintainance Guide +@title Gnus Coding Style and Maintenance Guide @author by Reiner Steib @insertcopying @end titlepage -@c Obviously this is only a very rudimentary draft. We put it in CVS -@c anyway hoping that it might annoy someone enough to fix it. ;-) -@c Fixing only a paragraph also is appreciated. +@c Obviously this is only a very rudimentary draft. We put it in the +@c repository anyway hoping that it might annoy someone enough to fix +@c it. ;-) Fixing only a paragraph also is appreciated. @ifnottex @node Top @@ -255,15 +255,17 @@ @section Stable and development versions -The development of Gnus normally is done on the CVS trunk, i.e. there -are no separate branches to develop and test new features. Most of the -time, the trunk is developed quite actively with more or less daily -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.8, @dots{}). -@ref{Gnus Development, ,Gnus Development, gnus, The Gnus Newsreader} +The development of Gnus normally is done on the Git repository trunk +as of April 19, 2010 (formerly it was done in CVS; the repository is +at http://git.gnus.org), i.e. there are no separate branches to +develop and test new features. Most of the time, the trunk is +developed quite actively with more or less daily 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.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 became a part of Emacs 21 (relabeled to Gnus 5.9). The 5.10 series @@ -333,8 +335,12 @@ @item For general Gnus development changes, of course you just make the -change on the Gnus CVS trunk and it goes into Emacs a few years +change on the Gnus Git trunk and it goes into Emacs a few years later... :-) + +With the new Git repository, we'll probably set up something to +automatically synchronize with Emacs when possible. CVS was much less +powerful for this kind of synchronization. @end itemize Of course in any case, if you just can't wait for me to sync your diff -r d7b6f0f1d150 -r d5fae6429937 doc/misc/gnus.texi --- a/doc/misc/gnus.texi Sun Apr 18 23:14:41 2010 +0000 +++ b/doc/misc/gnus.texi Sun Apr 18 23:26:57 2010 +0000 @@ -27096,6 +27096,10 @@ On the January 4th 2004, No Gnus was begun. +On April 19, 2010 Gnus development was moved to Git. See +http://git.gnus.org for details (http://www.gnus.org will be updated +with the information when possible). + If you happen upon a version of Gnus that has a prefixed name -- ``(ding) Gnus'', ``September Gnus'', ``Red Gnus'', ``Quassia Gnus'', ``Pterodactyl Gnus'', ``Oort Gnus'', ``No Gnus'' -- don't panic. @@ -28492,7 +28496,7 @@ hierarchy. @c FIXME: `gnus-load' is mentioned in README, which is not included in -@c CVS. We should find a better place for this item. +@c the repository. We should find a better place for this item. @item @code{(require 'gnus-load)} diff -r d7b6f0f1d150 -r d5fae6429937 lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Sun Apr 18 23:14:41 2010 +0000 +++ b/lisp/gnus/ChangeLog Sun Apr 18 23:26:57 2010 +0000 @@ -1,3 +1,11 @@ +2010-04-17 Teodor Zlatanov + + * smime.el: Don't mention CVS. + + * nnrss.el (nnrss-fetch): Don't mention CVS. + + * nnir.el: Don't mention CVS. + 2010-04-01 Andreas Schwab * mm-uu.el (mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system diff -r d7b6f0f1d150 -r d5fae6429937 lisp/gnus/nnir.el --- a/lisp/gnus/nnir.el Sun Apr 18 23:14:41 2010 +0000 +++ b/lisp/gnus/nnir.el Sun Apr 18 23:26:57 2010 +0000 @@ -52,7 +52,7 @@ ;; The most recent version of this can always be fetched from the Gnus -;; CVS repository. See http://www.gnus.org/ for more information. +;; repository. See http://www.gnus.org/ for more information. ;; This code is still in the development stage but I'd like other ;; people to have a look at it. Please do not hesitate to contact me diff -r d7b6f0f1d150 -r d5fae6429937 lisp/gnus/nnrss.el --- a/lisp/gnus/nnrss.el Sun Apr 18 23:14:41 2010 +0000 +++ b/lisp/gnus/nnrss.el Sun Apr 18 23:26:57 2010 +0000 @@ -427,7 +427,7 @@ (defun nnrss-fetch (url &optional local) "Fetch URL and put it in a the expected Lisp structure." (mm-with-unibyte-buffer - ;;some CVS versions of url.el need this to close the connection quickly + ;;some versions of url.el need this to close the connection quickly (let (cs xmlform htmlform) ;; bit o' work necessary for w3 pre-cvs and post-cvs (if local diff -r d7b6f0f1d150 -r d5fae6429937 lisp/gnus/smime.el --- a/lisp/gnus/smime.el Sun Apr 18 23:14:41 2010 +0000 +++ b/lisp/gnus/smime.el Sun Apr 18 23:26:57 2010 +0000 @@ -42,7 +42,7 @@ ;; done on messages encoded in these formats. The terminology chosen ;; reflect this. ;; -;; The home of this file is in Gnus CVS, but also available from +;; The home of this file is in Gnus, but also available from ;; http://josefsson.org/smime.html. ;;; Quick introduction: