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

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

diff --combined Makefile
index c316277f202e186d6eac15886c9c61a62a939b6b,b90bdf7ccf5f1e42dafbd04b7332ef70729c6810..fa3f7dffdde909f9ccd3406051ae83cce7bf6164
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,5 -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
@@@ -54,7 -54,7 +54,7 @@@ source-stamp
  
  
  updatedb:
 -      $(BIGMESS) cachefiles
 +      $(BIGMESS) cachefiles -f
        $(BIGMESS) updatedb
  
  upload-website: html