/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: John Arbash Meinel
  • Date: 2010-01-06 17:46:15 UTC
  • mto: (4634.119.1 2.0)
  • mto: This revision was merged to the branch mainline in revision 4951.
  • Revision ID: john@arbash-meinel.com-20100106174615-cq1nckxhbuyemgjx
https://launchpad.net/bugs/503886
Fix bug #503886, errors setting up logging go to stderr.

The basic issue is that we were using logging to describe failures
to set up logging. However, those fail with bad error messages
rather than giving us the output we want. This was especially bad
when the failure was occuring on the server. Since 'ssh' will pass
back the stderr stream without bzr handling it at all.

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