← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/conf.py

  • Committer: toto at example
  • Date: 2010-09-27 19:31:45 UTC
  • mfrom: (5050.17.27 2.2)
  • mto: This revision was merged to the branch mainline in revision 5448.
  • Revision ID: toto@example.com-20100927193145-bly1dw5wjd23hiwy
Merge lp:bzr/2.2 into trunk including fixes for #644855, #646133, #632387

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.sphinx_conf import *
17
 
 
 
16
from bzrlib.doc_generate.conf import *
18
17
 
19
18
## Configuration specific to this site ##
20
19
 
54
53
  # Manuals
55
54
  ('user-guide/index', 'bzr-%s-user-guide.tex' % (bzr_locale,),
56
55
    bzr_title(u'Bazaar User Guide'), bzr_team, 'manual'),
57
 
  ('user-reference/bzr_man', 'bzr-%s-user-reference.tex' % (bzr_locale,),
 
56
  ('user-reference/index', 'bzr-%s-user-reference.tex' % (bzr_locale,),
58
57
    bzr_title(u'Bazaar User Reference'), bzr_team, 'manual'),
59
58
  ('release-notes/NEWS', 'bzr-%s-release-notes.tex' % (bzr_locale,),
60
59
    bzr_title(u'Bazaar Release Notes'), bzr_team, 'manual'),