Merge remote-tracking branch 'alioth/master' into newdesign

[neurodebian.git] / sphinx / derivatives.rst

diff --git a/sphinx/derivatives.rst b/sphinx/derivatives.rst
index b80cbaf35c0f835efbe9c1b3546830473e1bf000..b0cb5de5f6396d890508c5752874a1f004677784 100644 (file)
--- a/sphinx/derivatives.rst
+++ b/sphinx/derivatives.rst
@@ -44,7 +44,7 @@ USB Stick for Computational Neuroscience by Cengiz Günay
 |                           | - Based on Ubuntu_ 11.04                              |
 +---------------------------+-------------------------------------------------------+
 |**Pre-installed Software** | NeuroDebian                                           |
-|                           |  TBA                                                  |
+|                           |  XPPAUT_ 6.11b, python-brian_                               |
 |                           | Custom:                                               |
 |                           |  Genesis_ 2.3, Neuron_ 7.2, XPPAUT_ 6.10              |
 +---------------------------+-------------------------------------------------------+
@@ -60,20 +60,20 @@ Lin4Neuro
 +---------------------------+-------------------------------------------------------+
 |**Author**                 | Kiyotaka Nemoto <kiyotaka@nemotos.net>                |
 +---------------------------+-------------------------------------------------------+
-|**Homepage**               | http://www.nemotos.net/?page_id=504                   |
+|**Homepage**               | http://www.nemotos.net/lin4neuro/                     |
 +---------------------------+-------------------------------------------------------+
 |**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                          |
+|                           | - Based on Ubuntu_ 10.04 LTS and Xubuntu_ 12.04 LTS   |
 +---------------------------+-------------------------------------------------------+
 |**Pre-installed Software** | NeuroDebian                                           |
 |                           |  AFNI_, AMIDE, Caret_, FSL_, LIPSIA_, mricron_, etc.  |
 |                           | Custom:                                               |
 |                           |  3DSlicer, Ginkgo CADx, MINC, MRIConvert, Virtual MRI |
 +---------------------------+-------------------------------------------------------+
-|**Download**               | ftp://ftp.nemotos.net/ [~2GB]                         |
+|**Download**               | http://www.nemotos.net/l4n-iso/ [~2GB]                |
 +---------------------------+-------------------------------------------------------+
 |**References**             | http://www.biomedcentral.com/1471-2342/11/3           |
 +---------------------------+-------------------------------------------------------+