/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/developers/conf.py

  • Committer: Max Bowsher
  • Date: 2011-02-02 14:33:27 UTC
  • mfrom: (5050.62.6 2.2)
  • mto: (5609.2.7 2.3)
  • mto: This revision was merged to the branch mainline in revision 5642.
  • Revision ID: maxb@f2s.com-20110202143327-mnplbp52i25y2mo2
https://launchpad.net/bugs/707075
Merge 2.2 into 2.3 for lp:707075. Also sync up doc/en/release-notes/bzr-2.2.txt
with bzr 2.2's NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/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.sphinx_conf import *
 
16
from bzrlib.doc_generate.conf import *
17
17
 
18
18
 
19
19
## Configuration specific to this site ##