Next version will be 3.0 cvs update

8 files changed, 56 insertions, 36 deletions

diff --git a/CHANGES b/CHANGES
index 8f1c4475..61259944 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Summary of Changes for Proof General 2.2 from 2.1
+Summary of Changes for Proof General 3.0 from 2.1
 =================================================
 
 Generic Changes
diff --git a/Makefile.devel b/Makefile.devel
index 3b07eb8c..7b81b5ad 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -51,7 +51,7 @@
 
 # Release tag.  For pre-releases.  Watch out with
 # substitution in tag target below, which edits $(DOWNLOADHTML)
-PRERELEASE_TAG=2.2pre$(shell date "+%y%m%d")
+PRERELEASE_TAG=3.0pre$(shell date "+%y%m%d")
 PREREL_TAG_FILE=prereltag.txt
 
 # html/download.phtml
diff --git a/README b/README
index b3e9c7ba..164469eb 100644
--- a/README
+++ b/README
@@ -21,7 +21,7 @@ at: http://www.dcs.ed.ac.uk/home/proofgen
 
 
 David Aspinall.
-August 1999.
+November 1999.
 
 NEWSFLASH:
 
diff --git a/TODO b/TODO
index 3efba2d0..dbbdd6a6 100644
--- a/TODO
+++ b/TODO
@@ -3,21 +3,30 @@ This is our brief list of planned things to do to Proof General.
 Please send any suggestions, comments, or offers of help to
 proofgen@dcs.ed.ac.uk.  Thanks!
 
-Plan of Changes for Proof General 2.2
---------------------------------------
+Plan of Changes for Proof General 3.0
+-------------------------------------
 
 * Fix bugs and improve code and documentation
   Based on user feedback.  
 
-* Queue manipulation improvment: allow to extend or reduce
-  during processing, with fewer "Proof Process Busy"
-  messages.  
-
 * Font-lock based on annotations in proof assistant output.
   Particularly: colouration for Isabelle variable names.
 
 * x-symbol support integration.
 
+* More toolbar buttons.  Improvement of menus.
+
+
+Plans for later versions
+------------------------
+
+* Add an example instantiation of Proof General
+  using no prover-specific extensions (perhaps for Isabelle)
+
+* Queue manipulation improvment: allow to extend or reduce
+  during processing, with fewer "Proof Process Busy"
+  messages.  
+
 * Isabelle PG: Non-blocking for .thy loading from .ML files.
   (hopefully as happy side effect of queue improvement)
 
@@ -27,15 +36,8 @@ Plan of Changes for Proof General 2.2
   processing.  Handle deleted buffers smoothly.
 
 
-MEDIUM TERM
------------
-
-* Add an example instantiation of Proof General
-  using no prover-specific extensions (perhaps for Isabelle)
-
-
-LONGER TERM
------------
+Plans for even later versions
+-----------------------------
 
 * Add a browser mode for browsing script files 
   and/or theory data-structures in the prover.
diff --git a/doc/ProofGeneral.texi b/doc/ProofGeneral.texi
index a28bef39..93ed3387 100644
--- a/doc/ProofGeneral.texi
+++ b/doc/ProofGeneral.texi
@@ -49,10 +49,10 @@
 @c
 
 
-@set version 2.2
+@set version 3.0
 @set xemacsversion 21.1
 @set fsfversion 20.2
-@set last-update October 1999
+@set last-update November 1999
 @set rcsid $Id$
 
 @ifinfo
diff --git a/etc/announce b/etc/announce
index 01672d3f..382aca11 100644
--- a/etc/announce
+++ b/etc/announce
@@ -27,9 +27,9 @@ To: coq-club@pauillac.inria.fr,
       
 
         
-Subject: Proof General --- Version 2.2 release
+Subject: Proof General --- Version 3.0 release
 
-           Announcing  Proof General  Version 2.2
+           Announcing  Proof General  Version 3.0
 
    A Generic Emacs interface for Interactive Proof Assistants
 
@@ -81,7 +81,7 @@ Emacs gurus.
 
 To users of LEGO, Coq, and Isabelle:
 ------------------------------------
-Proof General 2.2 has several new features as well as bug fixes and
+Proof General 3.0 has several new features as well as bug fixes and
 improvements over versions 2.1 and 2.0.  It supports the latest
 theorem prover versions: LEGO 1.3.1, Coq 6.3 and Isabelle 99.
 
diff --git a/html/download.phtml b/html/download.phtml
index 3b9585df..617e9ada 100644
--- a/html/download.phtml
+++ b/html/download.phtml
@@ -20,7 +20,7 @@ You can download the latest
 stable release, 
 <a href="#stable">ProofGeneral-2.1</a>, or the latest pre-release,
 <!-- Warning, next line edited by make file -->
-<a href="#prerel">ProofGeneral-2.2pre991001</a>.
+<a href="#prerel">ProofGeneral-3.0pre991001</a>.
 There is also a complete archive 
 of the current pre-release 
 <a href="#devel">for developers</a>.
@@ -102,7 +102,7 @@ any problems, suggestions, or patches.
 <hr>
 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<h2><a name="prerel">Pre-release: ProofGeneral-2.2pre991001</a></h2>
+<h2><a name="prerel">Pre-release: ProofGeneral-3.0pre991001</a></h2>
 <!-- End Warning. -->
 
 <p>
@@ -111,7 +111,7 @@ features are added and experimented with.
 <br>
 Check the 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<?php fileshow("ProofGeneral-2.2pre991001/CHANGES","CHANGES"); ?> file
+<?php fileshow("ProofGeneral-3.0pre991001/CHANGES","CHANGES"); ?> file
 <!-- End Warning. -->
 for a summary of changes since the last stable version, and
 the planned changes to come.
@@ -123,13 +123,13 @@ in a pre-release.
 <ul>
 <!-- WARNING!  Lines below automatically edited by makefile. -->
   <li> gzip'ed tar file: 
-      <?php download_link("ProofGeneral-2.2pre991001.tar.gz") ?>
+      <?php download_link("ProofGeneral-3.0pre991001.tar.gz") ?>
   </li>
   <li> Linux RPM package 
-      <?php download_link("ProofGeneral-2.2pre991001-1.noarch.rpm") ?>
+      <?php download_link("ProofGeneral-3.0pre991001-1.noarch.rpm") ?>
      <br>
      The source RPM is 
-      <?php download_link("ProofGeneral-2.2pre991001-1.src.rpm","here") ?>.
+      <?php download_link("ProofGeneral-3.0pre991001-1.src.rpm","here") ?>.
   </li>
 <!-- End Warning. -->
 </ul>
@@ -148,16 +148,16 @@ version distribution above is that we include:
   <li> provisional instantiations of Proof General to new provers <br>
 	(mentioned in the 
    <!-- WARNING!  Line below automatically edited by makefile. -->
-  <?php fileshow("ProofGeneral-2.2pre991001/CHANGES","CHANGES"); ?> file),
+  <?php fileshow("ProofGeneral-3.0pre991001/CHANGES","CHANGES"); ?> file),
    <!-- End Warning. -->
   </li>
   <li> the 
    <!-- WARNING!  Line below automatically edited by makefile. -->
-   <?php fileshow("ProofGeneral-2.2pre991001/todo","low-level list of things to do"); ?>
+   <?php fileshow("ProofGeneral-3.0pre991001/todo","low-level list of things to do"); ?>
    <!-- End Warning. -->
    and the detailed
    <!-- WARNING!  Line below automatically edited by makefile. -->
-   <?php fileshow("ProofGeneral-2.2pre991001/ChangeLog","ChangeLog"); ?>,
+   <?php fileshow("ProofGeneral-3.0pre991001/ChangeLog","ChangeLog"); ?>,
    <!-- End Warning. -->
  </li>
   <li> developer's Makefile used to generate documentation files <br>
@@ -173,7 +173,7 @@ release, because developers should have the right tools!
 <ul>
   <li> gzip'ed tar file: 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-      <?php download_link("ProofGeneral-2.2pre991001-devel.tar.gz") ?>
+      <?php download_link("ProofGeneral-3.0pre991001-devel.tar.gz") ?>
 <!-- End Warning. -->
   </li>
 </ul>
@@ -184,7 +184,7 @@ interested in hacking the Emacs lisp part of the program for
 a prover that is currently supported.  But you may
 still like to check the latest
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<?php fileshow("ProofGeneral-2.2pre991001/todo","low-level to-do list"); ?>.
+<?php fileshow("ProofGeneral-3.0pre991001/todo","low-level to-do list"); ?>.
 <!-- End Warning. -->
 </p>
 
diff --git a/html/news.phtml b/html/news.phtml
index c4f4ee88..332d7da2 100644
--- a/html/news.phtml
+++ b/html/news.phtml
@@ -1,11 +1,29 @@
 <ul>
+<li><b>6th October 1999</b><br>
+ <p>
+ The next version of Proof General will be 3.0.
+ </p>
+ <p>
+ There have been significant changes to the core of 
+ Proof General and many improvements in the code.
+ Extra features have been added, and the ones already
+ there improved upon.  Usability has been a particular
+ focus.  Adding new provers has been made easier.
+ Installation will be made even easier.
+ All of these changes warrant moving to a major release.
+ </p>
+ <p>
+ Version 3.0 is planned for release in November.
+ Please test a Version 3.0 pre-release if you can
+ and report any problems.
+ </p>
 <li><b>1st October 1999</b><br>
  <p>
- Recently there has been a flurry of work on the forthcoming Proof General 2.2. <br>  
+ Recently there has been a flurry of work on the next version of Proof General. <br>  
  It has quite a number of improvements (see
  the <?php fileshow("ProofGeneral/CHANGES","CHANGES"); ?> file), made
  by myself and Markus Wenzel.  <br>
- Version 2.2 is aimed to coincide
+ The next version is aimed to coincide
  (or perhaps pre-empt) the release of Isabelle 99.
  </p>
  <p>