← 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: Vincent Ladeuil
  • Date: 2012-03-13 09:07:18 UTC
  • mfrom: (6437.23.26 2.5)
  • mto: This revision was merged to the branch mainline in revision 6499.
  • Revision ID: v.ladeuil+lp@free.fr-20120313090718-2e5wf4d6otbh2k2r
Merge 2.5 branch including bugfix for #940164 and #944696

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']