changed configuration and main index.rst

docs/conf.py

@@ -36,10 +36,16 @@ extensions = [
     'sphinx.ext.inheritance_diagram',
     #'sphinx.ext.napoleon',
     'sphinx.ext.mathjax',
-    'sphinx.ext.autosummary',
+    #'sphinx.ext.pngmath',
+    'sphinx.ext.viewcode',
+        'sphinx.ext.autosummary',
     'numpydoc'
 ]
 
+# Intersphinx mapping
+intersphinx_mapping = {'numpy': ('http://docs.scipy.org/doc/numpy/', None)}
+
+
 # General information about the project.
 project = u'ProxToolbox'
 copyright = u'2015, Russell Luke'
@@ -120,7 +126,8 @@ modindex_common_prefix = ['proxtoolbox.']
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'sphinxdoc'
+# html_theme = 'sphinxdoc'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

docs/index.rst

@@ -14,7 +14,7 @@ For a complete listing of papers with links go to `publications <http://vaopt.ma
 
 This site is maintained by the 
 `Working Group in Variational Analysis <http://vaopt.math.uni-goettingen.de/en>`_ 
-at the University of Göttingen 
+of the `Institute for Numerical and Applied Mathematics <http://www.uni-goettingen.de/de/85746.html>`_ at the `University of Göttingen <https://www.uni-goettingen.de/en/1.html>`_. 
 
 .. raw:: html
 
@@ -40,7 +40,7 @@ Python version (still in development) |version|
 Matlab version (3.0, August 2017)
 ---------------------------------
 
-`Source <http://vaopt.math.uni-goettingen.de/en/software/ProxMatlab3.0.tar.gz>`_ (10.5mb)
+`Source <http://vaopt.math.uni-goettingen.de/en/software/ProxMatlab-Release3.0.tar.gz>`_ (10.5mb)
 
 
 Additional data
@@ -52,7 +52,8 @@ Additional data
 
 	`CT <http://vaopt.math.uni-goettingen.de/data/CT.tar.gz>`_ (1.7mb)
 
-The binary data need to be unpacked in the InputData/ subdirectory source code.
+The binary data need to be unpacked in the InputData/ subdirectory source code.  For example, the Phase data in 
+ProxMatlab would be in ProxMatlab/InputData/Phase.  
 
 .. automodule:: proxtoolbox
 
@@ -65,8 +66,9 @@ in the ProxMatlab tar-ball.
 
    Tutorial/tutorial
    Manual/content
-   Manual/addons
-
+   Manual/addons 
+   Matlab-to-Python
+   credits