← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/conf.py

  • Committer: Martin Pool
  • Date: 2010-06-02 05:03:31 UTC
  • mto: This revision was merged to the branch mainline in revision 5279.
  • Revision ID: mbp@canonical.com-20100602050331-n2p1qt8hfsahspnv
Correct more sloppy use of the term 'Linux'

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
 
55
56
    bzr_title(u'Bazaar User Guide'), bzr_team, 'manual'),
56
57
  ('user-reference/index', 'bzr-%s-user-reference.tex' % (bzr_locale,),
57
58
    bzr_title(u'Bazaar User Reference'), bzr_team, 'manual'),
58
 
  ('release-notes/index', 'bzr-%s-release-notes.tex' % (bzr_locale,),
 
59
  ('release-notes/NEWS', 'bzr-%s-release-notes.tex' % (bzr_locale,),
59
60
    bzr_title(u'Bazaar Release Notes'), bzr_team, 'manual'),
60
61
  ('upgrade-guide/index', 'bzr-%s-upgrade-guide.tex' % (bzr_locale,),
61
62
    bzr_title(u'Bazaar Upgrade Guide'), bzr_team, 'manual'),
87
88
    'user-reference/bzr_man',
88
89
    'user-guide/index-plain',
89
90
    'admin-guide/index-plain',
90
 
    # Templates
91
 
    'release-notes/release-template',
92
 
    'release-notes/series-template',
93
91
    # Miscellaneous
94
92
    'user-reference/readme',
95
93
]