← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics.py

  • Committer: Ian Clatworthy
  • Date: 2007-12-11 02:07:30 UTC
  • mto: (3119.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3120.
  • Revision ID: ian.clatworthy@internode.on.net-20071211020730-sdj4kj794dw0628e
make help topics more discoverable

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics.py
137
137
def _load_from_file(topic_name):
138
138
    """Load help from a file.
139
139
 
140
 
    The help is already expected to be in ReStructuredText format.
 
140
    Topics are expected to be in bzrlib/help_topics.
141
141
    """
142
142
    base = osutils.dirname(bzrlib.__file__)
143
143
    if getattr(sys, 'frozen', None):    # bzr.exe
144
144
        base = osutils.abspath(osutils.pathjoin(base, '..', '..'))
145
 
    filename = osutils.pathjoin(base, 'help', topic_name + ".txt")
 
145
    filename = osutils.pathjoin(base, 'help_topics', 'en', topic_name + ".txt")
146
146
    return open(filename, 'rU').read()
147
147
 
148
148