← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/conf.py

  • Committer: Vincent Ladeuil
  • Date: 2010-03-05 08:55:12 UTC
  • mfrom: (4797.2.27 2.1-integration)
  • mto: This revision was merged to the branch mainline in revision 5075.
  • Revision ID: v.ladeuil+lp@free.fr-20100305085512-rsguvvb02fbyx7zj
Merge 2.1 into bzr.dev including fixes for #524560 and #449776

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/conf.py
28
28
        u'Bazaar User Reference': None,
29
29
        u'Bazaar Release Notes': None,
30
30
        u'Bazaar Upgrade Guide': None,
 
31
        u"Bazaar System Administrator's Guide": None,
31
32
        u'Bazaar in five minutes': None,
32
33
        u'Bazaar Tutorial': None,
33
34
        u'Using Bazaar With Launchpad': None,
34
35
        u'Centralized Workflow Tutorial': None,
 
36
        u"What's New in Bazaar 2.1?": None,
35
37
    }
36
38
def bzr_title(s):
37
39
    return bzr_titles.get(s) or s
58
60
    bzr_title(u'Bazaar Release Notes'), bzr_team, 'manual'),
59
61
  ('upgrade-guide/index', 'bzr-%s-upgrade-guide.tex' % (bzr_locale,),
60
62
    bzr_title(u'Bazaar Upgrade Guide'), bzr_team, 'manual'),
 
63
  ('admin-guide/index', 'bzr-%s-admin-guide.tex' % (bzr_locale,),
 
64
    bzr_title(u"Bazaar System Administrator's Guide"), bzr_team, 'manual'),
61
65
  # Tutorials
62
66
  ('mini-tutorial/index', 'bzr-%s-tutorial-mini.tex' % (bzr_locale,),
63
67
    bzr_title(u'Bazaar in five minutes'), bzr_team, 'howto'),
69
73
  ('tutorials/centralized_workflow',
70
74
    'bzr-%s-tutorial-centralized.tex' % (bzr_locale,),
71
75
    bzr_title(u'Centralized Workflow Tutorial'), bzr_team, 'howto'),
 
76
  ('whats-new/whats-new-in-2.1', 'bzr-%s-whats-new.tex' % (bzr_locale,),
 
77
    bzr_title(u"What's New in Bazaar 2.1?"), bzr_team, 'howto'),
72
78
]
73
79
 
74
80
# List of documents that shouldn't be included in the build.