Skip to content

Commit

Permalink
Merge pull request #1752 from ESMCI/bertinia/doc
Browse files Browse the repository at this point in the history
format updates, fix warnings, add new glossary
  • Loading branch information
bertinia authored Jul 20, 2017
2 parents e1db2f1 + 774981d commit 2e46704
Show file tree
Hide file tree
Showing 9 changed files with 202 additions and 285 deletions.
19 changes: 12 additions & 7 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
# import os
# import sys
# sys.path.insert(0, os.path.abspath('.'))
import os
import sys
sys.path.insert(0, os.path.abspath('../...'))


# -- General configuration ------------------------------------------------
Expand All @@ -30,9 +30,14 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['sphinx.ext.todo',
extensions = [
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.githubpages']
'sphinx.ext.githubpages',
'sphinx.ext.autodoc',
'sphinx.ext.autosummary',
'sphinx.ext.viewcode'
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Expand All @@ -58,7 +63,7 @@
# The short X.Y version.
version = u'5.3.0'
# The full version, including alpha/beta/rc tags.
release = u'5.3.0_alpha17'
release = u'5.3.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -91,7 +96,7 @@
# further. For a list of options available for each theme, see the
# documentation.
#
# html_theme_options = {}
html_theme_options = { }

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
Expand Down
168 changes: 0 additions & 168 deletions doc/source/conf.py_old

This file was deleted.

Loading

0 comments on commit 2e46704

Please sign in to comment.