Merge branch 'newdesign' of github.com:neurodebian/neurodebian into newdesign

* 'newdesign' of github.com:neurodebian/neurodebian:
  Final upload URL and wording fix.

diff --git a/Makefile b/Makefile
index c316277f202e186d6eac15886c9c61a62a939b6b..fa3f7dffdde909f9ccd3406051ae83cce7bf6164 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-WWW_UPLOAD_URI = neurodebian@neurodebian.ovgu.de:/home/neurodebian/www
-#WWW_UPLOAD_URI = ../www
+#WWW_UPLOAD_URI = neurodebian@neurodebian.ovgu.de:/home/neurodebian/www
+WWW_UPLOAD_URI = ../../www
 WWW_DIR = build/html/
 
 WWW_UPLOAD_URI_STATIC=$(WWW_UPLOAD_URI)/_static

diff --git a/sphinx/index.rst b/sphinx/index.rst
index ed4a6c4650eb52192d9c269d49b946534b308650..30626ea14407d4de6fed790729db50434ef8e2ba 100644 (file)
--- a/sphinx/index.rst
+++ b/sphinx/index.rst
@@ -9,8 +9,8 @@ software for the Debian_ operating system as well as Ubuntu_ and other
 derivatives. Popular packages include FSL, Freesurfer, AFNI, PyMVPA and
 :ref:`many others <pkg_tocs>`. While we do strive to maintain a high level of
 quality, we make no guarantee that a given package works as expected, so use
-them at your own risk. If you do encounter problems or would just like to thank
-us, simply `send us an email <#contacts>`_.
+them at your own risk. If you do encounter problems or you just like to say
+thanks, simply `send us an email <#contacts>`_.
 
 Learn more about NeuroDebian, the goals of this project, and help us |spread|!