From: Michael Hanke <michael.hanke@gmail.com>
Date: Fri, 7 Dec 2012 08:38:03 +0000 (+0100)
Subject: Merge branch 'master' into newdesign
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1f3e1e3baea966d60a549aaa16e5e03ad890a473;p=neurodebian.git

Merge branch 'master' into newdesign

* master:
  updated VM page for 6.0.6 (with the date when VM was wrapped on 1st of Oct)
  add remake to give it a page

Conflicts:
	sphinx/vm.rst
---

1f3e1e3baea966d60a549aaa16e5e03ad890a473
diff --cc sphinx/vm.rst
index f8caf10,8beca27..7a34c0e
--- a/sphinx/vm.rst
+++ b/sphinx/vm.rst
@@@ -206,38 -285,3 +206,42 @@@ My VM lost mounted host directories aft
           virtualbox-ose-guest-utils  virtualbox-ose-guest-x11
  
    and reboot VM.
 +
 +
 +What has changed
 +----------------
 +
 +.. raw:: html
 +
 +  <div class="expandinstructions">Click on an item to expand it</div>
 +
++6.0.6 -- 01 Oct 2012
++
++  * Updated core system to Debian squeeze 6.0.6
++
 +6.0.5 -- 10 Nov 2011
 +  * Updated core system to Debian squeeze 6.0.3
 +  * Updated shipped virtualbox-ose guest-utils and guest-x11 to 4.0.10
 +
 +    - ``~/host`` is now symlinked to correct path ``/media/sf_host``
 +    - ``brain`` user is added to ``vboxsf`` group so mounted host
 +      directories should become readily available
 +
 +  * Root partition size and swap space got doubled in size (40GB
 +    and 2GB correspondingly).  Space is allocated dynamically so
 +    the actual size of the virtual drive should not grow unless
 +    you use it
 +
 +6.0.4 -- 13 Jun 2011
 +  * Updated shipped virtualbox-ose guest-utils and guest-x11 to 4.0.4
 +
 +6.0.3 -- 12 Jun 2011 [Superseded in the archive by 6.0.4]
 +  * Updated to Squeeze 6.0.1
 +  * Updated VirtualBox guest additions to 4.0.4 from backports.debian.org
 +  * Appliance is available as a single file (.ova) ready for the import
 +
 +6.0.2 -- 08 Feb 2011
 +  * Minor update
 +
 +6.0.1 -- 01 Dec 2010
 +  * Minor update