/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/en/conf.py

  • Committer: Andrew Bennetts
  • Date: 2010-07-29 04:07:27 UTC
  • mto: (5050.3.16 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100729040727-amlyw1jt3xhw17ku
Delete test_merge_into, and put those tests directly in test_merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/conf.py
54
54
  # Manuals
55
55
  ('user-guide/index', 'bzr-%s-user-guide.tex' % (bzr_locale,),
56
56
    bzr_title(u'Bazaar User Guide'), bzr_team, 'manual'),
57
 
  ('user-reference/bzr_man', 'bzr-%s-user-reference.tex' % (bzr_locale,),
 
57
  ('user-reference/index', 'bzr-%s-user-reference.tex' % (bzr_locale,),
58
58
    bzr_title(u'Bazaar User Reference'), bzr_team, 'manual'),
59
59
  ('release-notes/NEWS', 'bzr-%s-release-notes.tex' % (bzr_locale,),
60
60
    bzr_title(u'Bazaar Release Notes'), bzr_team, 'manual'),