[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 27/30] qapi: Use rST markup for literal blocks
From: |
Peter Maydell |
Subject: |
[PATCH v2 27/30] qapi: Use rST markup for literal blocks |
Date: |
Thu, 13 Feb 2020 17:56:44 +0000 |
There are exactly two places in our json doc comments where we
use the markup accepted by the texi doc generator where a '|' in
the first line of a doc comment means the line should be emitted
as a literal block (fixed-width font, whitespace preserved).
Since we use this syntax so rarely, instead of making the rST
generator support it, instead just convert the two uses to
rST-format literal blocks, which are indented and introduced
with '::'.
(The rST generator doesn't complain about the old style syntax,
it just emits it with the '|' and with the whitespace not
preserved, which looks odd, but means we can safely leave this
change until after we've stopped generating texinfo.)
Signed-off-by: Peter Maydell <address@hidden>
---
qapi/block-core.json | 16 +++++++++-------
qapi/qapi-schema.json | 6 ++++--
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 13dad62f441..ea0371c33fb 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -550,13 +550,15 @@
# For the example above, @bins may be something like [3, 1, 5, 2],
# and corresponding histogram looks like:
#
-# | 5| *
-# | 4| *
-# | 3| * *
-# | 2| * * *
-# | 1| * * * *
-# | +------------------
-# | 10 50 100
+# ::
+#
+# 5| *
+# 4| *
+# 3| * *
+# 2| * * *
+# 1| * * * *
+# +------------------
+# 10 50 100
#
# Since: 4.0
##
diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json
index f7ba60a5d0b..1d3fb573846 100644
--- a/qapi/qapi-schema.json
+++ b/qapi/qapi-schema.json
@@ -22,8 +22,10 @@
#
# Example:
#
-# | -> data issued by the Client
-# | <- Server data response
+# ::
+#
+# -> data issued by the Client
+# <- Server data response
#
# Please, refer to the QMP specification (docs/interop/qmp-spec.txt) for
# detailed information on the Server command and response formats.
--
2.20.1
- Re: [PATCH v2 17/30] qapi/migration.json: Replace _this_ with *this*, (continued)
- [PATCH v2 22/30] scripts/qapi: Move doc-comment whitespace stripping to doc.py, Peter Maydell, 2020/02/13
- [PATCH v2 20/30] qapi/machine.json: Escape a literal '*' in doc comment, Peter Maydell, 2020/02/13
- [PATCH v2 21/30] tests/qapi/doc-good.json: Clean up markup, Peter Maydell, 2020/02/13
- [PATCH v2 28/30] qga/qapi-schema.json: Add some headings, Peter Maydell, 2020/02/13
- [PATCH v2 25/30] docs/interop: Convert qemu-ga-ref to rST, Peter Maydell, 2020/02/13
- [PATCH v2 09/30] qapi: Fix indent level on doc comments in json files, Peter Maydell, 2020/02/13
- [PATCH v2 24/30] docs/sphinx: Add new qapi-doc Sphinx extension, Peter Maydell, 2020/02/13
- [PATCH v2 27/30] qapi: Use rST markup for literal blocks,
Peter Maydell <=
- [PATCH v2 23/30] scripts/qapi/parser.py: improve doc comment indent handling, Peter Maydell, 2020/02/13
- [PATCH v2 26/30] docs/interop: Convert qemu-qmp-ref to rST, Peter Maydell, 2020/02/13
- [PATCH v2 30/30] docs/devel/qapi-code-gen.txt: Update to new rST backend conventions, Peter Maydell, 2020/02/13
- [PATCH v2 29/30] scripts/qapi: Remove texinfo generation support, Peter Maydell, 2020/02/13
- Re: [PATCH v2 00/30] Convert QAPI doc comments to generate rST instead of texinfo, no-reply, 2020/02/13