Update.

diff --git a/ChangeLog b/ChangeLog
index 6b63dda..04dac85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+1998-12-09  Keiichi Suzuki  <kei-suzu@mail.wbs.ne.jp>
+
+       * lisp/gnus.el (gnus-version-number): Update to 6.11.2.
+
+       * Sync up with gnus-6_9.
+
+* 1998-12-08  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * lisp/smtp.el (smtp-via-smtp): Use `open-network-stream-as-binary'
+       instead of `open-network-stream'.
+       * lisp/pop3.el (pop3-open-server): Likewise.
+       * lisp/nntp.el (nntp-open-network-stream): Likewise.
+       * lisp/gnus-gl.el (bbb-connect-to-bbbd): Likewise.
+
 1998-12-07  Keiichi Suzuki  <kei-suzu@mail.wbs.ne.jp>
 
        * lisp/message.el (message-get-parameter-with-eval): Call

diff --git a/README.branch b/README.branch
index 188fbd6..4128131 100644 (file)
--- a/README.branch
+++ b/README.branch
@@ -1,7 +1,7 @@
 README.branch --- description of branches and tags. (DRAFT)
 ========================================================================
 
-Semi-gnus revision tree (1998-07-16)
+Semi-gnus revision tree (1998-12-09)
 
     vendor      personal    main trunk      public
     branch      branches                    branches
@@ -26,15 +26,21 @@ Gnus 5.6.11 ------>           6.3.3
        :                        |    \        6.6.0        stable branch
        :                        |     \
        :                        |      ---> 6.7 (for SEMI 1.8, FLIM 1.7)
-       :                        |             6.7.0       develop branch
+       :                        |             6.7.0        stable branch
        :     sync               |               :
 Gnus 5.6.22 ------>             |   feedback  6.7.7
        :                     (6.7.8)<------   6.7.8
        :                        |    \
        :                        |     \
        :                        |      ---> 6.8 (for SEMI 1.8, FLIM 1.8)
-       :     sync               |             6.8.0
-Gnus 5.6.24 ------>             |             6.8.1
+       :        keiichi  <--  6.8.18          6.8.0        stable branch
+       :     sync               |               :
+Gnus 5.6.45 ------>             |   feedback  6.8.20
+       :                     (6.8.20)<------  6.8.20
+       :                        |     \
+       :                        |      \
+       :                        |       --> 6.9 (for SEMI 1.11, FLIM 1.12)
+       :                        |             6.9.1       develop branch
        :                        :               :
        :                        :               :
 ========================================================================
@@ -82,8 +88,9 @@ Public Branches
        for-semi-1_6    Semi-gnus for SEMI 1.6 API
        gnus-6_5        Semi-gnus for SEMI 1.7 API
        gnus-6_6        Semi-gnus for SEMI 1.8, FLIM 1.7 API (stable)
-       gnus-6_7        Semi-gnus for SEMI 1.8, FLIM 1.7 API (develop)
-       gnus-6_8        Semi-gnus for SEMI 1.8, FLIM 1.8 API
+       gnus-6_7        Semi-gnus for SEMI 1.8, FLIM 1.7 API (stable)
+       gnus-6_8        Semi-gnus for SEMI 1.8, FLIM 1.8 API (stable)
+       gnus-6_9        Semi-gnus for SEMI 1.11,FLIM 1.12 API (develop)
 
 Personal Branches
 
@@ -97,6 +104,7 @@ Personal Branches
        ichikawa        Owner: Tatsuya Ichikawa
        akr             Owner: Tanaka Akira
        shuhei-k        Owner: Shuhei KOBAYASHI
+       keiichi         Owner: Keiichi Suzuki
 
 "semi-gnus" Tag
 

diff --git a/README.semi b/README.semi
index 92809fe..8540989 100644 (file)
--- a/README.semi
+++ b/README.semi
@@ -1,4 +1,4 @@
-This package contains Semi-gnus.
+This package contains Semi-gnus 6.9.
 
 What is Semi-gnus?
 ==================
@@ -8,7 +8,8 @@ all features of Gnus and gnus-mime, so there are no need to install
 Gnus to use it, and you must not use gnus-mime for SEMI.
 
   It requires SEMI package, so please get and install SEMI package
-before to install it. You can get SEMI from
+before to install it. Nana-gnus 6.11 requires SEMI 1.12. You can get
+SEMI from
 ftp://ftp.jaist.ac.jp/pub/elisp/semi/
 Required environment for SEMI is written in README.en of SEMI package.
 
@@ -55,11 +56,16 @@ Major tags are following:
     ichikawa           ichikawa branch
                        Based on pGnus.
 
+    pgnus-ichikawa     ichikawa branch. Based on pGnus
+
     akr                        akr branch
 
     shuhei-k           shuhei-k branch
                        Mail-Followup-To/Mail-Reply-To, gnus-cache fix.
 
+    keiichi             keiichi branch
+    nana-gnus-N1_N2     Stable version of `keiichi branch'.
+
 For more detailed information, please read README.branch.