On Thu, 23 Mar 2023 at 14:48, Markus Armbruster <arm...@redhat.com> wrote: > > The QAPI schema doc comment language provides special syntax for command > and event arguments, struct and union members, alternate branches, > enumeration values, and features: "sections" starting with @arg:. > > By convention, we format them like this: > > # @arg: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed > # do eiusmod tempor incididunt ut labore et dolore magna > # aliqua. > > Okay for names as short as "name", but we have much longer ones. Their > description gets squeezed against the right margin, like this: > > # @dirty-sync-missed-zero-copy: Number of times dirty RAM synchronization > could > # not avoid copying dirty pages. This is > between > # 0 and @dirty-sync-count * > @multifd-channels. > # (since 7.1) > > The description is effectively 50 characters wide. Easy enough to read, > but awkward to write.
The documentation also permits a second form: # @argone: # This is a two line description # in the first style. We tend to use that for type names, not field names, but IIRC it's the same handling for both. I'll re-mention here something I said back in 2020 when we were landing the rST-conversion of the qapi docs: There is rST syntax for field lists and option lists: https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#field-lists which are kind of similar to what we're doing with @foo: stuff markup, and which handle indentation like this: :Hello: This field has a short field name, so aligning the field body with the first line is feasible. :Number-of-African-swallows-required-to-carry-a-coconut: It would be very difficult to align the field body with the left edge of the first line. It may even be preferable not to begin the body on the same line as the marker. The differences to what we have today are: * indent of lines 2+ is determined by the indent of line 2, not 1 * lines 2+ must be indented, so anything that currently uses "no indent, start in column 0" would need indenting. (This would be a lot of change to our current docs text.) At the time I think I basically went with "whatever requires the minimum amount of change to the existing doc comments and parser to get them into a shape that Sphinx is happy with". But if we're up for a wide reformatting then maybe it would be worth following the rST syntax? PS: I see with a quick grep we also have misformatted field docs; check out for instance the HTML rendering of the bps_max etc fields of BlockDeviceInfo, which is weird because the second line of the field docs in the sources is wrongly indented. -- PMM