From: John Snow <[email protected]>
Signed-off-by: John Snow <[email protected]>
Message-ID: <[email protected]>
Reviewed-by: Markus Armbruster <[email protected]>
Signed-off-by: Markus Armbruster <[email protected]>
[Missing update to tests/qapi-schema/doc-good.txt squashed in]
Signed-off-by: Markus Armbruster <[email protected]>
---
tests/qapi-schema/doc-good.json | 8 ++++----
tests/qapi-schema/doc-good.out | 15 ++++++---------
tests/qapi-schema/doc-good.txt | 4 ++--
tests/qapi-schema/doc-interleaved-section.err | 2 +-
tests/qapi-schema/doc-interleaved-section.json | 3 +--
5 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/tests/qapi-schema/doc-good.json b/tests/qapi-schema/doc-good.json
index fac13425b7..d9a84ccd72 100644
--- a/tests/qapi-schema/doc-good.json
+++ b/tests/qapi-schema/doc-good.json
@@ -94,10 +94,9 @@
##
# @Variant1:
+# A paragraph
#
-# A paragraph
-#
-# Another paragraph
+# Another paragraph
#
# @var1 is undocumented
#
@@ -206,7 +205,8 @@
##
# @cmd-boxed:
-# If you're bored enough to read this, go see a video of boxed cats
+# If you're bored enough to read this, go see a video of boxed
+# cats
#
# Features:
# @cmd-feat1: a feature
diff --git a/tests/qapi-schema/doc-good.out b/tests/qapi-schema/doc-good.out
index 371dd25ffc..eaaf119dea 100644
--- a/tests/qapi-schema/doc-good.out
+++ b/tests/qapi-schema/doc-good.out
@@ -126,15 +126,13 @@ doc symbol=Base
minimally indented
doc symbol=Variant1
Intro
+ A paragraph
- Plain
-A paragraph
-
-Another paragraph
-
-@var1 is undocumented
+ Another paragraph
Member=var1
+ Plain
+@var1 is undocumented
Feature=variant1-feat
a feature
Feature=member-feat
@@ -213,9 +211,8 @@ Note::
2.10
doc symbol=cmd-boxed
Intro
-
- Plain
-If you're bored enough to read this, go see a video of boxed cats
+ If you're bored enough to read this, go see a video of boxed
+ cats
Feature=cmd-feat1
a feature
Feature=cmd-feat2
diff --git a/tests/qapi-schema/doc-good.txt b/tests/qapi-schema/doc-good.txt
index 74b73681d3..ba089a7f94 100644
--- a/tests/qapi-schema/doc-good.txt
+++ b/tests/qapi-schema/doc-good.txt
@@ -65,11 +65,11 @@ Object Variant1
Another paragraph
- "var1" is undocumented
-
Members:
* **var1** ("string") -- Not documented
+ "var1" is undocumented
+
Features:
* **variant1-feat** -- a feature
diff --git a/tests/qapi-schema/doc-interleaved-section.err
b/tests/qapi-schema/doc-interleaved-section.err
index e5d1ef54c1..85f01fa57a 100644
--- a/tests/qapi-schema/doc-interleaved-section.err
+++ b/tests/qapi-schema/doc-interleaved-section.err
@@ -1 +1 @@
-doc-interleaved-section.json:15:1: description of '@foobar:' follows a section
+doc-interleaved-section.json:14:1: description of '@foobar:' follows a section
diff --git a/tests/qapi-schema/doc-interleaved-section.json
b/tests/qapi-schema/doc-interleaved-section.json
index eec01ed565..bc0937b860 100644
--- a/tests/qapi-schema/doc-interleaved-section.json
+++ b/tests/qapi-schema/doc-interleaved-section.json
@@ -2,8 +2,7 @@
##
# @TestStruct:
-#
-# body
+# body
#
# @integer: foo
# blah
--
2.55.0
