← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/conf.py

  • Committer: Robert Collins
  • Date: 2010-06-28 02:41:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100628024122-g951fzp74f3u6wst
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/conf.py
13
13
sys.path = [os.path.abspath('../..')] + sys.path
14
14
 
15
15
# Most of the configuration for Bazaar docs is defined here ...
16
 
from bzrlib.doc_generate.conf import *
 
16
from bzrlib.doc_generate.sphinx_conf import *
 
17
 
17
18
 
18
19
## Configuration specific to this site ##
19
20