ENH: added info/links for VM 6.999.b4.20121231

also moved more links into link_names

diff --git a/sphinx/link_names.txt b/sphinx/link_names.txt
index 057c19d2bc5d4aee193fbeb0780b5d8a89944335..289973974a2a84758a53e599cddfa408f1a18059 100644 (file)
--- a/sphinx/link_names.txt
+++ b/sphinx/link_names.txt
@@ -136,6 +136,16 @@
 .. _Lin4Neuro: http://www.nemotos.net/lin4neuro
 .. _fail2ban: http://www.fail2ban.org
 
+.. Debian releases
+.. _Debian 6.0 (squeeze): http://www.debian.org/releases/squeeze
+.. _Debian 7.0 (wheezy): http://www.debian.org/releases/wheezy
+
+.. Desktop environments
+.. _GNOME: http://www.gnome.org/
+.. _GNOME3: http://www.gnome.org/gnome-3/
+.. _XFCE: http://www.xfce.org/
+.. _XFCE4: http://www.xfce.org/
+
 .. Functional imaging labs
 .. _`functional imaging laboratory`: http://www.fil.ion.ucl.ac.uk
 .. _FMRIB: http://www.fmrib.ox.ac.uk
@@ -184,7 +194,7 @@
 .. |ITP| replace:: :abbr:`ITP (Intent to Package)`
 .. |RFP| replace:: :abbr:`RFP (Request for packaging)`
 .. |DBTS| replace:: :abbr:`DBTS (Debian Bug Tracking System)`
-
+.. _debian-installer: http://www.debian.org/devel/debian-installer/
 .. mailing lists
 .. _neurodebian-users: http://lists.alioth.debian.org/mailman/listinfo/neurodebian-users
 .. _neurodebian-devel: http://lists.alioth.debian.org/mailman/listinfo/neurodebian-devel

diff --git a/sphinx/vm.rst b/sphinx/vm.rst
index 8beca2749d434cf0c7c6f93bd23d75eded942cf7..cc202c4b25b6f8f8bfccc46094e176ebad6b4cec 100644 (file)
--- a/sphinx/vm.rst
+++ b/sphinx/vm.rst
@@ -15,15 +15,18 @@ once installed, be equipped with a large variety of neuroscience software with
 just a few mouse clicks (e.g. AFNI_, Caret_, FSL_, PyMVPA_).
 
 .. _virtual machine: http://en.wikipedia.org/wiki/Virtual_machine
-.. _AFNI: http://afni.nimh.nih.gov/afni/
-.. _Caret: http://brainvis.wustl.edu/wiki/index.php/Caret:About
-.. _FSL: http://www.fmrib.ox.ac.uk/fsl/
-.. _PyMVPA: http://www.pymvpa.org
 
 
 Downloads
 ---------
 
+Stable (6.x series)
+~~~~~~~~~~~~~~~~~~~
+
+Based on current stable `Debian 6.0 (squeeze)`_ release.  This VM
+provides a stable, well tested environment with the most of the recent
+releases available from NeuroDebian.
+
 * `NeuroDebian 6.0.6 image (32bit)
   <http://neuro.debian.net/debian/vm/NeuroDebian_6.0.6_i386.ova>`_ [~559MB]
 
@@ -38,6 +41,29 @@ Downloads
   virtualization support. The should include all recent Apple hardware and most
   64bit Windows systems.*
 
+Development (to be 7.x series)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Based on upcoming `Debian 7.0 (wheezy)`_ release.  Although already
+quite stable, there might be outstanding issues.  This VM also
+switches from GNOME_ (v.2) desktop environment to XFCE4_.  We
+recommend this VM over a stable one for anyone needing recent releases
+of tools not available for the stable VM (e.g. recent pandas) --
+**getting a complete "Scientific Python" stack with 100s of other
+Python modules was never easier**.  Moreover your feedback might also
+be valuable to polish upcoming Debian wheezy release and NeuroDebian
+VM 7.0.
+
+* `NeuroDebian 6.999.b4.20121231 image (32bit)
+  <http://neuro.debian.net/debian/vm/NeuroDebian_6.999.b4.20121231_i386.ova>`_ [~656MB]
+
+* `NeuroDebian 6.999.b4.20121231 image (64bit)
+  <http://neuro.debian.net/debian/vm/NeuroDebian_6.999.b4.20121231_amd64.ova>`_ [~660MB]
+
+
+Historical
+~~~~~~~~~~
+
 Virtual appliances above carry guest additions for 4.x series of the
 VirtualBox. If you still have VirtualBox 3.x, use previous 6.0.2
 virtual appliances:
@@ -74,6 +100,11 @@ virtual appliances:
 Changes
 -------
 
+6.999.b4.20121231 -- 31 Dec 2012
+
+      * Based on beta 4 release of debian-installer_ for wheezy
+      * Comes with XFCE4_ instead of GNOME_
+
 6.0.6 -- 01 Oct 2012
 
       * Updated core system to Debian squeeze 6.0.6
@@ -121,8 +152,6 @@ will benefit from security bug fixes provided by the Debian project for the
 whole operating system, as well as from software updates for
 neuroscience-related packages.
 
-.. _Debian 6.0 (squeeze): http://www.debian.org/releases/squeeze
-.. _GNOME: http://www.gnome.org/
 
 
 Installation
@@ -285,3 +314,5 @@ mounted host directories.
          virtualbox-ose-guest-utils  virtualbox-ose-guest-x11
 
   and reboot VM.
+
+.. include:: link_names.txt