Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian

* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  minor phrasing
  Added my talk at UPENN

diff --git a/sphinx/index.rst b/sphinx/index.rst
index 41aaf165b6d281a8899cbfa345dffc0a38a4d27c..052c687b563c17809bfae1df20073bd93b7ca4e8 100644 (file)
--- a/sphinx/index.rst
+++ b/sphinx/index.rst
@@ -97,7 +97,7 @@ the terminal you can use :command:`apt-get`::
 Popularity Contest
 ------------------
 
-We would strongly encourage you to participate in the `popularity
+We encourage you to participate in the `popularity
 contest <http://popcon.debian.org>`_ (popcon), which anonymously
 collects the list of packages you installed/use on your system.
 Collecting such statistics is of particular importance for research
@@ -230,6 +230,12 @@ If your are interested in mirroring the repository, please see the :ref:`faq`.
 Publications
 ============
 
+Halchenko, Y.O. & Hanke, M. (2012). `Environments for efficient
+contemporary research in neuroimaging: PyMVPA and NeuroDebian
+<_files/HalchenkoHanke_ContemporaryNeuroimaging_PENN2012.pdf>`_.
+*Talk given at the University of Pennsylvania School of Medicine*,
+Philadelphia, PA, USA.
+
 Hanke, M. (2012). `Rock solid, brand new, everyday, for free, not a joke:
 NeuroDebian <_files/Hanke_NeuroDebian_MPI2012.pdf>`_.
 *Talk given at the Max-Planck-Institute for Human Cognitive and Brain