From 890e88a77289fcd5f781bbcbd1e5424dd3ac5069 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 22 Apr 2013 10:18:56 -0400 Subject: [PATCH] Minor fixes (might have been done in the master already... heh -- yet to merge/CP --- sphinx/derivatives.rst | 2 +- sphinx/projects.rst | 3 +++ sphinx/publications.rst | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sphinx/derivatives.rst b/sphinx/derivatives.rst index b0cb5de..f237519 100644 --- 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 | -| | XPPAUT_ 6.11b, python-brian_ | +| | XPPAUT_ 6.11b, python-brian_ | | | Custom: | | | Genesis_ 2.3, Neuron_ 7.2, XPPAUT_ 6.10 | +---------------------------+-------------------------------------------------------+ diff --git a/sphinx/projects.rst b/sphinx/projects.rst index b03d6c1..5b26a5c 100644 --- a/sphinx/projects.rst +++ b/sphinx/projects.rst @@ -75,10 +75,13 @@ Promotion * Conferences presence of the team presenting Debian_, NeuroDebian_, and related work: + **May 2-6, 2011** `Paradyn/Condor Week `_, Madison, Wisconsin, USA Hanke, M. `Talk: Integrating Condor into the Debian operating system `__ + **June 26-30, 2011** `HBM 2011 `_, Québec City, Canada Debian/NeuroDebian booth `#108 `__ + **July 21-23, 2011** `PsychoPy Workshop and Codesprint `_, New Haven, CT, USA **August 25-30, 2011** `EuroSciPy 2011/ Python in NeuroScience `_, Paris, France diff --git a/sphinx/publications.rst b/sphinx/publications.rst index b3469db..514b827 100644 --- a/sphinx/publications.rst +++ b/sphinx/publications.rst @@ -94,6 +94,3 @@ efficient, more open, and more fun .. _DebConf10: http://debconf10.debconf.org/ .. _Dartmouth College: http://www.dartmouth.edu/ -.. _chap_popularity: - - -- 2.39.2