Skip to content

Commit

Permalink
Merge pull request #116 from edx/markhoeber-install-guide-fix
Browse files Browse the repository at this point in the history
Install-Config Guide change log and theme fix
  • Loading branch information
mhoeber committed Jan 22, 2015
2 parents 71781de + 7fff095 commit 1557c34
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 22 deletions.
8 changes: 2 additions & 6 deletions en_us/install_operations/source/change_log.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,15 @@
Change Log
############

************
May, 2014
************

.. list-table::
:widths: 10 70
:header-rows: 1

* - Date
- Change
* - 01/20/2014
* - 01/20/2015
- Addition of the section :ref:`Installing edX Insights`
* - 01/14/2014
* - 01/14/2015
- Addition of the section :ref:`Setting up the Mobile Applications`
* - 06/07/2014
- Addition of the section :ref:`Installing the edX Production Stack`
Expand Down
57 changes: 41 additions & 16 deletions en_us/install_operations/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,18 @@
# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'

if not on_rtd: # only import and set the theme if we're building docs locally
import sphinx_rtd_theme
html_theme = 'sphinx_rtd_theme'
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]






# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

master_doc = 'index'

sys.path.append(os.path.abspath('../../../'))
sys.path.append(os.path.abspath('../../'))
# The suffix of source filenames.
source_suffix = '.rst'

#from docs.shared.conf import *
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'

sys.path.insert(0, os.path.abspath('.'))

master_doc = 'index'

# Add any paths that contain templates here, relative to this directory.
#templates_path.append('source/_templates')
Expand All @@ -38,7 +30,40 @@

# General information about the project.
project = u'Installing, Configuring, and Running the edX Platform'
copyright = u'2014, edX'
copyright = u'2015, edX'

# The short X.Y version.
version = ''
# The full version, including alpha/beta/rc tags.
release = ''

# -- Options for HTML output ---------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
# html_theme = 'default'
html_theme = 'edx_theme'

# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
html_theme_path = ['../../_themes']

html_favicon = '../../_themes/edx_theme/static/css/favicon.ico'

#html_use_smartypants = True
html_use_smartypants = True

if on_rtd:
html_context = {
"on_rtd" : on_rtd,
"google_analytics_id" : '',
"disqus_shortname" : 'edx',
"github_base_account" : 'edx',
"github_project" : 'edx-documentation',
}

#remove directory when content is first added to it, and add to index
exclude_patterns = ['links.rst']

# The short X.Y version.
version = ''
Expand Down

0 comments on commit 1557c34

Please sign in to comment.