← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/doc_generate/conf.py
6
6
# All configuration values have a default; values that are commented out
7
7
# serve to show the default.
8
8
 
9
 
import sys, os
 
9
from __future__ import absolute_import
10
10
 
11
11
# FIXME: better move the content of doc/en/conf.py here and cleanup the result
12
12
# -- vila 20100428
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']