← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tools/doc_generate/autodoc_man.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_man.py
80
80
        cmd_help = cmd_object.help()
81
81
        if cmd_help:
82
82
            firstline = cmd_help.split('\n', 1)[0]
83
 
            usage = bzrlib.help.command_usage(cmd_object)
 
83
            usage = cmd_object._usage()
84
84
            tmp = '.TP\n.B "%s"\n%s\n' % (usage, firstline)
85
85
            output = output + tmp
86
86
        else:
101
101
 
102
102
def format_command (params, cmd):
103
103
    """Provides long help for each public command"""
104
 
    subsection_header = '.SS "%s"\n' % (bzrlib.help.command_usage(cmd))
 
104
    subsection_header = '.SS "%s"\n' % (cmd._usage())
105
105
    doc = "%s\n" % (cmd.__doc__)
106
106
    doc = cmd.help()
107
107
 
131
131
        aliases_str += ', '.join(cmd.aliases)
132
132
        aliases_str += '\n'
133
133
 
134
 
    return subsection_header + option_str + aliases_str + "\n" + doc + "\n"
 
134
    see_also_str = ""
 
135
    see_also = cmd.get_see_also()
 
136
    if see_also:
 
137
        see_also_str += '\nSee also: '
 
138
        see_also_str += ', '.join(see_also)
 
139
        see_also_str += '\n'
 
140
 
 
141
    return subsection_header + option_str + aliases_str + see_also_str + "\n" + doc + "\n"
135
142
 
136
143
 
137
144
man_preamble = """\