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
1=== modified file 'docs/conf.py'
2--- docs/conf.py 2013-12-06 15:11:12 +0000
3+++ docs/conf.py 2014-02-11 13:06:32 +0000
4@@ -12,9 +12,8 @@
5 # serve to show the default.
6
7 # Import maas' settings.
8-from maas import settings
9-from django.core.management import setup_environ
10-setup_environ(settings)
11+from os import environ
12+environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.settings")
13
14 # If extensions (or modules to document with autodoc) are in another directory,
15 # add these directories to sys.path here. If the directory is relative to the
16
17=== modified file 'versions.cfg'
18--- versions.cfg 2014-01-31 16:14:52 +0000
19+++ versions.cfg 2014-02-11 13:06:32 +0000
20@@ -6,9 +6,9 @@
21 [versions-doc]
22 # Versions in Precise
23 docutils = 0.11
24-Jinja2 = 2.7
25+Jinja2 = 2.7.2
26 Pygments = 1.6
27-Sphinx = 1.1.3
28+Sphinx = 1.2.1
29 collective.recipe.sphinxbuilder = 0.7.3
30
31 [versions-dev]