From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
jsnow@redhat.com, eblake@redhat.com, mdroth@linux.vnet.ibm.com,
marcandre.lureau@redhat.com
Subject: [PATCH 2/2] docs/devel/qapi-code-gen: Belatedly document feature documentation
Date: Tue, 26 Oct 2021 13:10:23 +0200 [thread overview]
Message-ID: <20211026111023.76937-3-armbru@redhat.com> (raw)
In-Reply-To: <20211026111023.76937-1-armbru@redhat.com>
Commit 6a8c0b5102 "qapi: Add feature flags to struct types" neglected
to document how to document feature flags. Make up for that.
Cc: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
docs/devel/qapi-code-gen.rst | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst
index 1f6805a705..4b79623f51 100644
--- a/docs/devel/qapi-code-gen.rst
+++ b/docs/devel/qapi-code-gen.rst
@@ -949,15 +949,16 @@ definition must have documentation.
Definition documentation starts with a line naming the definition,
followed by an optional overview, a description of each argument (for
commands and events), member (for structs and unions), branch (for
-alternates), or value (for enums), and finally optional tagged
-sections.
+alternates), or value (for enums), a description of each feature (if
+any), and finally optional tagged sections.
-Descriptions of arguments can span multiple lines. The description
-text can start on the line following the '\@argname:', in which case it
-must not be indented at all. It can also start on the same line as
-the '\@argname:'. In this case if it spans multiple lines then second
-and subsequent lines must be indented to line up with the first
-character of the first line of the description::
+The description of an argument or feature 'name' starts with
+'\@name:'. The description text can start on the line following the
+'\@argname:', in which case it must not be indented at all. It can
+also start on the same line as the '\@argname:'. In this case if it
+spans multiple lines then second and subsequent lines must be indented
+to line up with the first character of the first line of the
+description::
# @argone:
# This is a two line description
@@ -979,6 +980,12 @@ The number of spaces between the ':' and the text is not significant.
Extensions added after the definition was first released carry a
'(since x.y.z)' comment.
+The feature descriptions must be preceded by a line "Features:", like
+this::
+
+ # Features:
+ # @feature: Description text
+
A tagged section starts with one of the following words:
"Note:"/"Notes:", "Since:", "Example"/"Examples", "Returns:", "TODO:".
The section ends with the start of a new section.
--
2.31.1
next prev parent reply other threads:[~2021-10-26 11:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 11:10 [PATCH 0/2] qapi: Documentation improvements Markus Armbruster
2021-10-26 11:10 ` [PATCH 1/2] docs/devel/qapi-code-gen: Drop a duplicate paragraph Markus Armbruster
2021-10-26 11:12 ` Philippe Mathieu-Daudé
2021-10-26 16:09 ` John Snow
2021-10-26 11:10 ` Markus Armbruster [this message]
2021-10-26 15:04 ` [PATCH 2/2] docs/devel/qapi-code-gen: Belatedly document feature documentation Kevin Wolf
2021-10-26 15:16 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211026111023.76937-3-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).