← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/conf.py

  • Committer: Danny van Heumen
  • Date: 2010-03-09 16:38:10 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309163810-ujn8hcx08f75nlf1
Refined test to make use of locking hooks and also validate if lock is truly a checkout-lock.

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
 
27
28
        u'Bazaar User Reference': None,
28
29
        u'Bazaar Release Notes': None,
29
30
        u'Bazaar Upgrade Guide': None,
30
 
        u"Bazaar System Administrator's Guide": None,
31
31
        u'Bazaar in five minutes': None,
32
32
        u'Bazaar Tutorial': None,
33
33
        u'Using Bazaar With Launchpad': None,
34
34
        u'Centralized Workflow Tutorial': None,
35
 
        u"What's New in Bazaar 2.1?": None,
36
35
    }
37
36
def bzr_title(s):
38
37
    return bzr_titles.get(s) or s
53
52
  # Manuals
54
53
  ('user-guide/index', 'bzr-%s-user-guide.tex' % (bzr_locale,),
55
54
    bzr_title(u'Bazaar User Guide'), bzr_team, 'manual'),
56
 
  ('user-reference/index', 'bzr-%s-user-reference.tex' % (bzr_locale,),
 
55
  ('user-reference/bzr_man', 'bzr-%s-user-reference.tex' % (bzr_locale,),
57
56
    bzr_title(u'Bazaar User Reference'), bzr_team, 'manual'),
58
57
  ('release-notes/NEWS', 'bzr-%s-release-notes.tex' % (bzr_locale,),
59
58
    bzr_title(u'Bazaar Release Notes'), bzr_team, 'manual'),
60
59
  ('upgrade-guide/index', 'bzr-%s-upgrade-guide.tex' % (bzr_locale,),
61
60
    bzr_title(u'Bazaar Upgrade Guide'), bzr_team, 'manual'),
62
 
  ('admin-guide/index', 'bzr-%s-admin-guide.tex' % (bzr_locale,),
63
 
    bzr_title(u"Bazaar System Administrator's Guide"), bzr_team, 'manual'),
64
61
  # Tutorials
65
62
  ('mini-tutorial/index', 'bzr-%s-tutorial-mini.tex' % (bzr_locale,),
66
63
    bzr_title(u'Bazaar in five minutes'), bzr_team, 'howto'),
72
69
  ('tutorials/centralized_workflow',
73
70
    'bzr-%s-tutorial-centralized.tex' % (bzr_locale,),
74
71
    bzr_title(u'Centralized Workflow Tutorial'), bzr_team, 'howto'),
75
 
  ('whats-new/whats-new-in-2.1', 'bzr-%s-whats-new.tex' % (bzr_locale,),
76
 
    bzr_title(u"What's New in Bazaar 2.1?"), bzr_team, 'howto'),
77
72
]
78
73
 
79
74
# List of documents that shouldn't be included in the build.
80
75
unused_docs = [
 
76
    # Placeholder for later
 
77
    'admin-guide/index',
81
78
    # Subtopics that get included
82
79
    'upgrade-guide/overview',
83
80
    'upgrade-guide/data_migration',
86
83
    'release-notes/NEWS',
87
84
    'user-reference/bzr_man',
88
85
    'user-guide/index-plain',
89
 
    'admin-guide/index-plain',
90
86
    # Miscellaneous
91
87
    'user-reference/readme',
92
88
]