Launchpad itself

Merge lp:~jml/launchpad/internet-is-bad-for-you-723003 into lp:launchpad

  1. internet-is-bad-for-you-723003
  2. Merge into devel
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: not available
Merged at revision: 12432
Proposed branch: lp:~jml/launchpad/internet-is-bad-for-you-723003
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
doc/conf.py (+1/-1)
To merge this branch: bzr merge lp:~jml/launchpad/internet-is-bad-for-you-723003
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+50790@code.launchpad.net

Description of the change

This branch disables the "intersphinx" extension used to build our Sphinx docs. Although it would be nice to have, it demands internet access, which is simply unacceptable for something that we want to build.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Nyahahahhah

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/conf.py'
2--- doc/conf.py 2011-02-04 16:40:45 +0000
3+++ doc/conf.py 2011-02-22 18:03:39 +0000
4@@ -25,7 +25,7 @@
5
6 # Add any Sphinx extension module names here, as strings. They can be extensions
7 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
8-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo']
9+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo']
10
11 # Add any paths that contain templates here, relative to this directory.
12 templates_path = ['_templates']