← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tools/doc_generate/autodoc_rstx.py

  • Committer: Martin Pool
  • Date: 2007-04-24 05:02:04 UTC
  • mfrom: (2449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2450.
  • Revision ID: mbp@sourcefrog.net-20070424050204-bfkc1qiq0axt5f14
Merge trunk & fix NEWS conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/doc_generate/autodoc_rstx.py
73
73
        cmd_help = cmd_object.help()
74
74
        if cmd_help:
75
75
            firstline = cmd_help.split('\n', 1)[0]
76
 
            usage = bzrlib.help.command_usage(cmd_object)
 
76
            usage = cmd_object._usage()
77
77
            tmp = '**%s**\n\t%s\n\n' % (usage, firstline)
78
78
            output = output + tmp
79
79
        else:
97
97
 
98
98
def format_command (params, cmd, name):
99
99
    """Provides long help for each public command"""
100
 
    usage = bzrlib.help.command_usage(cmd)
 
100
    usage = cmd._usage()
101
101
    subsection_header = """
102
102
%s
103
103
%s
135
135
        aliases_str += ', '.join(cmd.aliases)
136
136
        aliases_str += '\n'
137
137
 
138
 
    return subsection_header + option_str + aliases_str + "\n" + doc + "\n"
 
138
    see_also_str = ""
 
139
    see_also = cmd.get_see_also()
 
140
    if see_also:
 
141
        see_also_str += '\n    See also: '
 
142
        see_also_str += ', '.join(see_also)
 
143
        see_also_str += '\n'
 
144
 
 
145
    return subsection_header + option_str + aliases_str + see_also_str + "\n" + doc + "\n"
139
146
 
140
147
 
141
148
##