← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/doc_generate/conf.py

  • Committer: Patch Queue Manager
  • Date: 2012-03-13 09:36:00 UTC
  • mfrom: (6498.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20120313093600-lb7qlh29e7d7kr68
(vila) Merge 2.5 branch including bugfix for #940164 and #944696
 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/doc_generate/conf.py
21
21
 
22
22
# Add any Sphinx extension module names here, as strings. They can be extensions
23
23
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
24
 
extensions = ['sphinx.ext.ifconfig',
25
 
              'bzrlib.doc_generate.builders.texinfo']
 
24
extensions = ['sphinx.ext.ifconfig',]
26
25
 
27
26
# Add any paths that contain templates here, relative to this directory.
28
27
templates_path = ['_templates']