Reword/restructure VM pages

diff --git a/sphinx/_templates/layout.html b/sphinx/_templates/layout.html
index 98406af6902966acec550a9ae342929b429a4269..fb57ceb149c02481cfbca6695ef8a91bdbb43740 100644 (file)
--- a/sphinx/_templates/layout.html
+++ b/sphinx/_templates/layout.html
@@ -9,6 +9,7 @@
   <li><a href="{{ pathto('index') }}">Neuroscience Repository</a> :&nbsp;</li>
   <li><a href="{{ pathto('pkgs') }}">Software</a> |&nbsp;</li>
   <li><a href="{{ pathto('datasets') }}">Datasets</a> |&nbsp;</li>
+  <li><a href="{{ pathto('vm') }}">Virtual Machine</a> |&nbsp;</li>
   <li><a href="{{ pathto('faq') }}">FAQ</a> |&nbsp;</li>
   <li><a href="{{ pathto('testimonials') }}">Testimonials</a> &nbsp;</li>
 {% endblock %}

diff --git a/sphinx/index.rst b/sphinx/index.rst
index 4406164d9c49f1b72a67472390e59e1ce24eaa38..dba18d1a191d6aa81cd246c32953a0adfb9bccfe 100644 (file)
--- a/sphinx/index.rst
+++ b/sphinx/index.rst
@@ -33,6 +33,8 @@ If you appreciate this service, please |spread|.
 
 .. _Ubuntu: http://www.ubuntu.com
 
+.. _news:
+
 News
 ====
 
@@ -190,6 +192,7 @@ for all their work.
 
 .. _FOSS: http://en.wikipedia.org/wiki/Free_and_open_source_software
 
+.. _support:
 
 Contacts
 ========

diff --git a/sphinx/vm.rst b/sphinx/vm.rst
index cb20678b842054b97e4169e2aa2170b10a19e5f8..a6979a32c0dcb9915be56653f7362b55660b3507 100644 (file)
--- a/sphinx/vm.rst
+++ b/sphinx/vm.rst
@@ -7,35 +7,27 @@ NeuroDebian Virtual Machine
    :random: 1
    :tags: vm
 
-Those, who are not yet running a Debian-based operating system, but are already
-tired of fiddling with dozens of neuro-software packages, can get a glimpse of
-neuroscience research in a Debian environment via a `virtual machine`_.
+For those who are not yet running a Debian-based operation system we offer a
+`virtual machine`_ that can be used with `VirtualBox`_ to allow users to benefit
+from a Debian-based research environment on other operating systems.
+This virtual machine initially comes as a compact Debian installation that can,
+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
-
-NeuroDebian offers a virtual machine that comes preinstalled with a number
-of popular neuroscience packages (e.g. AFNI_, Caret_, FSL_, PyMVPA_).
-
 .. _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
 
-The virtual machine contains an installation of `Debian 5.0 (lenny)`_ with a
-GNOME_ desktop environment. All installed software comes from standard Debian
-packages, or prospective Debian packages from NeuroDebian -- no custom
-installations whatsoever. This means that all contained software is readily
-available for any system running a Debian operating system (or a recent Ubuntu
-release). The virtual machine can be seen as a showcase of what Debian for
-neuroscience research feels like. Moreover, once downloaded this virtual
-machine can be kept up to date, just as any other Debian installation. Using
-convenient graphical package management tools users will benefit from security
-bugfixes provided by the Debian project for the whole operating system, as well
-as from software updates for neuroscience-related packages.
 
-.. _Debian 5.0 (lenny): http://www.debian.org/releases/stable
-.. _GNOME: http://www.gnome.org/
+Downloads
+---------
 
+* `NeuroDebian 6.0.0 image (amd64)
+  <http://neuro.debian.net/debian/vm/neurodebian_6.0.0_amd64.zip>`_ [~600MB]
+* `VirtualBox download page <http://www.virtualbox.org/wiki/Downloads>`_ (Windows, Linux, Mac,
+  Solaris)
 
 Installation
 ------------
@@ -117,6 +109,27 @@ the password, since `sudo` is configured to work without it.
 Enjoy!
 
 
+
+Details
+-------
+
+The virtual machine contains an installation of `Debian 5.0 (lenny)`_ with a
+GNOME_ desktop environment. All installed software comes from standard Debian
+packages, or prospective Debian packages from NeuroDebian -- no custom
+installations whatsoever. This means that all contained software is readily
+available for any system running a Debian operating system (or a recent Ubuntu
+release). The virtual machine can be seen as a showcase of what Debian for
+neuroscience research feels like. Moreover, once downloaded this virtual
+machine can be kept up to date, just as any other Debian installation. Using
+convenient graphical package management tools users will benefit from security
+bugfixes provided by the Debian project for the whole operating system, as well
+as from software updates for neuroscience-related packages.
+
+.. _Debian 5.0 (lenny): http://www.debian.org/releases/stable
+.. _GNOME: http://www.gnome.org/
+
+
+
 Troubleshooting
 ---------------
 
@@ -133,4 +146,3 @@ I cannot hear sounds played in the virtual machine.
 
   Sorry, but audio is not (yet) preconfigured properly. If you want to have that
   fixed, please drop us a note.
-

diff --git a/sphinx/vm_welcome.rst b/sphinx/vm_welcome.rst
new file mode 100644 (file)
index 0000000..dd0803a
--- /dev/null
+++ b/sphinx/vm_welcome.rst
@@ -0,0 +1,14 @@
+.. _chap_vm_welcome:
+
+Welcome to the NeuroDebian Virtual Machine
+==========================================
+
+Congratulations, you have successfully configured you NeuroDebian virtual
+machine. Below you can find a list of resources that you may find
+interesting:
+
+* :ref:`NeuroDebian news <news>`
+* :ref:`User support <support>`
+* :ref:`Virtual machine tutorial video <chap_vm>`
+* :ref:`Known issues <chap_vm>`
+