Merge remote-tracking branch 'gh-cengique/master'

* gh-cengique/master:
  Several fixes in live image page and minor changes in derivatives page
  Addressed Yaroslav's comments on first draft about usb stick degradation, virtual machines, and clarifying the scope of the license.
  draft version of comp neurosci live usb stick blog page w/o download links

diff --combined sphinx/derivatives.rst
index e98af4ae3bb06219fc2b70d9a961002045d5aa6b,a90d7788ecd6b2eeae5a5212cc38d758539195fd..bab14eb1dc347cb820d6652f0777b1516611d3bb
--- 1/sphinx/derivatives.rst
--- 2/sphinx/derivatives.rst
+++ b/sphinx/derivatives.rst
@@@ -7,26 -7,23 +7,26 @@@
  NeuroDebian "Derivatives"
  *************************
  
 +.. replace with icons eventually
 +
 +`Live CD/USB Media`_ | `Virtual Appliances`_ | `Cloud Solutions`_
 +
  NeuroDebian_ is not a *Linux distribution* in a traditional sense because we
 -work within Debian_ project thus not providing our custom installer etc.  But
 -we are a Linux-distribution providing a repository of up-to-date builds and
 -maintaining a :ref:`chap_vm` deployment of Debian.  Because of the openness
 -and modularity of Debian other enthusiasts develop customized derivative
 -solutions based to address a particular demand.
 +are working within Debian_ project thus not providing our custom installer
 +etc.  But we are a Linux-distribution providing a repository of up-to-date
 +builds and maintaining a :ref:`chap_vm` deployment of Debian.  Because of the
 +openness and modularity of Debian other enthusiasts develop customized
 +derivative solutions to address their particular needs.
  
 -This page presents such *derivative* projects which are tuned for particular
 -domains of application in neuroscience and rely on NeuroDebian_ as the origin
 -for necessary tools.
 +This page presents some of such *derivative* projects which are tuned for
 +particular domains of application in neuroscience and rely on NeuroDebian_ as
 +the origin of necessary tools.
  
  .. note::
  
     These projects are not maintained by NeuroDebian_ team.  Please direct all
     you support inquiries to respective authors/maintainers.
  
 -
  Live CD/USB Media
  =================
  
@@@ -34,19 -31,19 +34,19 @@@ USB Stick for Computational Neuroscienc
  --------------------------------------------------------
  
  +---------------------------+-------------------------------------------------------+
- |**Author**                 |Cengiz Günay <cgunay@emory.edu>                        |
+ |**Author**                 | Cengiz Günay <cengique AT users.sf.net>               |
  +---------------------------+-------------------------------------------------------+
- |**Homepage**               | N/A                                                   |
+ |**Homepage**               | (Why don't we put the blog page here?)                |
  +---------------------------+-------------------------------------------------------+
  |**Purpose**                | Computational neuroscience tools for course-work      |
  +---------------------------+-------------------------------------------------------+
  |**Features**               | - Persistent Storage                                  |
- |                           | - XXX                                                 |
+ |                           | - Based on Ubuntu 11.04                               |
  +---------------------------+-------------------------------------------------------+
  |**Pre-installed Software** | NeuroDebian                                           |
  |                           |   Brian (XXX?), XXX                                   |
  |                           | Custom:                                               |
- |                           |   Genesis, Neuron, XPPAUT                             |
+ |                           |   Genesis 2.3, Neuron 7.2, XPPAUT 6.10                |
  +---------------------------+-------------------------------------------------------+
  |**Download**               | http://neuro.debian.net/debian/live/3rd/XXX.iso [2GB] |
  +---------------------------+-------------------------------------------------------+
@@@ -57,71 -54,25 +57,71 @@@
  Lin4Neuro
  ---------
  
 ++---------------------------+-------------------------------------------------------+
 +|**Author**                 | Kiyotaka Nemoto <kiyotaka@nemotos.net>                |
 ++---------------------------+-------------------------------------------------------+
 +|**Homepage**               | http://www.nemotos.net/?page_id=504                   |
 ++---------------------------+-------------------------------------------------------+
 +|**Purpose**                | Neuroimaging tools for course-work                    |
 ++---------------------------+-------------------------------------------------------+
 +|**Features**               | - Datasets and tutorials from C.Rorden (MRIcron)      |
 +|                           | - Both 32- and 64-bit images                          |
 +|                           | - Based on Ubuntu 10.04 LTS                           |
 ++---------------------------+-------------------------------------------------------+
 +|**Pre-installed Software** | NeuroDebian                                           |
 +|                           |   AFNI, AMIDE, Caret, FSL, LIPSIA, MRIcron, etc.      |
 +|                           | Custom:                                               |
 +|                           |   3DSlicer, MINC, MRIConvert, Virtual MRI             |
 ++---------------------------+-------------------------------------------------------+
 +|**Download**               | ftp://ftp.nemotos.net/ [~2GB]                         |
 ++---------------------------+-------------------------------------------------------+
 +|**References**             | http://www.biomedcentral.com/1471-2342/11/3           |
 ++---------------------------+-------------------------------------------------------+
 +
  
  Virtual Appliances
  ==================
  
 -* XNAT
 -* MIPAV
 +XNAT
 +----
  
 ++---------------------------+-------------------------------------------------------+
 +|**Author**                 | Satrajit Ghosh <satra@mit.edu>                        |
 ++---------------------------+-------------------------------------------------------+
 +|**Homepage**               | http://datasharing.incf.org/ni/Install_XNAT           |
 ++---------------------------+-------------------------------------------------------+
 +|**Purpose**                | XNAT deployment                                       |
 ++---------------------------+-------------------------------------------------------+
 +|**Features**               | - XNAT 1.5                                            |
 +|                           | - 64-bit only                                         |
 +|                           | - Based on NeuroDebian VM appliance                   |
 ++---------------------------+-------------------------------------------------------+
 +|**Pre-installed Software** | Custom:                                               |
 +|                           |   XNAT                                                |
 ++---------------------------+-------------------------------------------------------+
 +|**Download**               | `XNAT 1.5.0 NeuroDebian VM <xnat_vm_image>`_          |
 ++---------------------------+-------------------------------------------------------+
  
 -Cloud Environments
 -==================
 +.. _xnat_vm_image: http://neuro.debian.net/_files/contrib/NeuroDebian_6.0.2+XNAT1.5.0-1_amd64.ova
 +
 +
 +JIST Development Virtual Machine
 +--------------------------------
 +
 +http://www.nitrc.org/projects/jist
 +
 +
 +Cloud Solutions
 +===============
  
 -* NITRC?
 +NeuroCloud
 +----------
  
 +http://gow.epsrc.ac.uk/ViewGrant.aspx?GrantRef=EP/I016856/1
  
 -Cloud Images
 -============
 +..  * INCF Cloud App?
  
 -* UK Grant project
 -* INCF Cloud App?
 +..  * NITRC?
  
  
  .. include:: link_names.txt