From: Yaroslav Halchenko <debian@onerussian.com>
Date: Sat, 14 May 2011 02:20:07 +0000 (-0400)
Subject: adjusted projects pages: conference presence etc
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8eaaadccfd588e3dd8230c44304edfab1ebaff03;p=neurodebian.git

adjusted projects pages: conference presence etc
---

diff --git a/sphinx/proj_neuralmodeling.rst b/sphinx/proj_neuralmodeling.rst
index 7730ae6..1090e0b 100644
--- a/sphinx/proj_neuralmodeling.rst
+++ b/sphinx/proj_neuralmodeling.rst
@@ -15,11 +15,10 @@ Status
 ------
 
 This effort initiated with packaging of :ref:`Brian <pkg_python-brian>`
-already available from NeuroDebian repository.
+and :ref:`PyNN <pkg_python-pynn>` already available from Debian_ and NeuroDebian_ repositories.
 
 .. todo::  Neural modeling software coverage
 
-   * Complete packaging of :ref:`PyNN <pkg_python-pynn>`
    * Complete packaging of :ref:`PCSIM <pkg_python-pcsim>`
    * Complete packaging of :ref:`NEURON <pkg_neuron>`
 
diff --git a/sphinx/proj_psychophysics.rst b/sphinx/proj_psychophysics.rst
index b830812..387fade 100644
--- a/sphinx/proj_psychophysics.rst
+++ b/sphinx/proj_psychophysics.rst
@@ -19,7 +19,7 @@ Debian_ distribution and working on extending support of other tools and
 libraries used in psychopysics research to interface with the stimuli delivery
 and responses collection hardware.
 
-.. todo:: Tailor Debian for psychopysics research
+.. todo:: Tailor Debian_ for psychopysics research
 
    * Complete packaging of :ref:`Psychtoolbox-3 <pkg_octave-psychtoolbox-3>`
    * Provide convenience package and guidelines for assuring robust
diff --git a/sphinx/projects.rst b/sphinx/projects.rst
index ee45f87..08726e0 100644
--- a/sphinx/projects.rst
+++ b/sphinx/projects.rst
@@ -69,12 +69,18 @@ Promotion
   - `Debian / NeuroDebian tri-fold
     <http://neuro.debian.net/_files/brochure_debian-neurodebian.pdf>`_
 
-* Conferences presence.  To promote NeuroDebian_ project we consider
-  (conditioned on funding and agreements with organizers) presenting
-  NeuroDebian_ at
-
-  - `HBM 2011 <http://www.humanbrainmapping.org/HBM2011>`_
-  - `Invite us <mailto:team@neuro.debian.net>`_
+* Conferences presence of the team presenting Debian_,
+  NeuroDebian_, and related work:
+
+  **May 2-6, 2011** `Paradyn/Condor Week <http://www.cs.wisc.edu/condor/ParadynCondorWeek2011>`_, Madison, Wisconsin, USA
+    Hanke, M. `Talk: Integrating Condor into the Debian operating system <http://www.cs.wisc.edu/condor/ParadynCondorWeek2011/presentations/hanke-condor-debian.pdf>`__
+  **June 26-30, 2011** `HBM 2011 <http://www.humanbrainmapping.org/HBM2011>`_, Québec City, Canada
+    Debian/NeuroDebian booth `#108 <http://www.humanbrainmapping.org/files/2011MeetingFiles/Exhibit_Floor_Plan-5_10_2011.PDF>`__
+  **August 25-30, 2011** `EuroSciPy 2011/ Python in NeuroScience <http://www.euroscipy.org/conference/euroscipy2011>`_, Paris, France
+	Talks TBA
+  **November 12-16, 2011** `SfN 2011 <http://www.sfn.org/am2011/>`_, Washington, District Columbia, USA
+    Booth TBA
+  `Invite us <mailto:team@neuro.debian.net>`_
 
 * `Inviting contributions and new members to join the NeuroDebian project
   <https://openhatch.org/+projects/NeuroDebian>`_