MAAS

Merge lp:~allenap/maas/docs-where-art-thou into lp:~maas-committers/maas/trunk

  1. docs-where-art-thou
  2. Merge into trunk
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 1925
Proposed branch: lp:~allenap/maas/docs-where-art-thou
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 31 lines (+4/-5)
2 files modified
docs/conf.py (+2/-3)
versions.cfg (+2/-2)
To merge this branch: bzr merge lp:~allenap/maas/docs-where-art-thou
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+205761@code.launchpad.net

Commit message

Get Sphinx documentation generation working on Trusty.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'docs/conf.py'
--- docs/conf.py 2013-12-06 15:11:12 +0000
+++ docs/conf.py 2014-02-11 13:06:32 +0000
@@ -12,9 +12,8 @@
12# serve to show the default.12# serve to show the default.
1313
14# Import maas' settings.14# Import maas' settings.
15from maas import settings15from os import environ
16from django.core.management import setup_environ16environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.settings")
17setup_environ(settings)
1817
19# If extensions (or modules to document with autodoc) are in another directory,18# If extensions (or modules to document with autodoc) are in another directory,
20# add these directories to sys.path here. If the directory is relative to the19# add these directories to sys.path here. If the directory is relative to the
2120
=== modified file 'versions.cfg'
--- versions.cfg 2014-01-31 16:14:52 +0000
+++ versions.cfg 2014-02-11 13:06:32 +0000
@@ -6,9 +6,9 @@
6[versions-doc]6[versions-doc]
7# Versions in Precise7# Versions in Precise
8docutils = 0.118docutils = 0.11
9Jinja2 = 2.79Jinja2 = 2.7.2
10Pygments = 1.610Pygments = 1.6
11Sphinx = 1.1.311Sphinx = 1.2.1
12collective.recipe.sphinxbuilder = 0.7.312collective.recipe.sphinxbuilder = 0.7.3
1313
14[versions-dev]14[versions-dev]