From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org, John Snow <jsnow@redhat.com>
Subject: [PULL 11/13] qapi: add markup to note blocks
Date: Sat, 6 Jul 2024 09:24:14 +0200 [thread overview]
Message-ID: <20240706072416.1717485-12-armbru@redhat.com> (raw)
In-Reply-To: <20240706072416.1717485-1-armbru@redhat.com>
From: John Snow <jsnow@redhat.com>
Generally, surround command-line options with ``literal`` markup to help
it stand out from prose in rendered HTML, and add cross-references to
replace "see also" messages.
References to types, values, and other QAPI definitions are not yet
adjusted here; they will be converted en masse in a subsequent patch
after the new QAPI doc generator is merged.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240626222128.406106-13-jsnow@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qapi/control.json | 4 ++--
qapi/misc.json | 8 ++++----
qapi/qdev.json | 2 +-
qapi/run-state.json | 2 +-
qapi/sockets.json | 2 +-
qapi/ui.json | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/qapi/control.json b/qapi/control.json
index 59d5e00c15..fe2af45120 100644
--- a/qapi/control.json
+++ b/qapi/control.json
@@ -24,8 +24,8 @@
#
# .. note:: This command is valid exactly when first connecting: it must
# be issued before any other command will be accepted, and will fail
-# once the monitor is accepting other commands. (see qemu
-# docs/interop/qmp-spec.rst)
+# once the monitor is accepting other commands.
+# (see :doc:`/interop/qmp-spec`)
#
# .. note:: The QMP client needs to explicitly enable QMP capabilities,
# otherwise all the QMP capabilities will be turned off by default.
diff --git a/qapi/misc.json b/qapi/misc.json
index 13ea82f525..b04efbadec 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -104,7 +104,7 @@
# Returns a list of information about each iothread.
#
# .. note:: This list excludes the QEMU main loop thread, which is not
-# declared using the -object iothread command-line option. It is
+# declared using the ``-object iothread`` command-line option. It is
# always the main thread of the process.
#
# Returns: a list of @IOThreadInfo for each iothread
@@ -138,8 +138,8 @@
#
# .. note:: This function will succeed even if the guest is already in
# the stopped state. In "inmigrate" state, it will ensure that the
-# guest remains paused once migration finishes, as if the -S option
-# was passed on the command line.
+# guest remains paused once migration finishes, as if the ``-S``
+# option was passed on the command line.
#
# In the "suspended" state, it will completely stop the VM and cause
# a transition to the "paused" state. (Since 9.0)
@@ -161,7 +161,7 @@
# .. note:: This command will succeed if the guest is currently running.
# It will also succeed if the guest is in the "inmigrate" state; in
# this case, the effect of the command is to make sure the guest
-# starts once migration finishes, removing the effect of the -S
+# starts once migration finishes, removing the effect of the ``-S``
# command line option if it was passed.
#
# If the VM was previously suspended, and not been reset or woken,
diff --git a/qapi/qdev.json b/qapi/qdev.json
index f5b35a814f..d031fc3590 100644
--- a/qapi/qdev.json
+++ b/qapi/qdev.json
@@ -59,7 +59,7 @@
# the 'docs/qdev-device-use.txt' file.
#
# 3. It's possible to list device properties by running QEMU with
-# the "-device DEVICE,help" command-line argument, where DEVICE
+# the ``-device DEVICE,help`` command-line argument, where DEVICE
# is the device's name.
#
# Example:
diff --git a/qapi/run-state.json b/qapi/run-state.json
index 30cd25d3c9..4d40c88876 100644
--- a/qapi/run-state.json
+++ b/qapi/run-state.json
@@ -146,7 +146,7 @@
# @reason: The @ShutdownCause which resulted in the SHUTDOWN.
# (since 4.0)
#
-# .. note:: If the command-line option "-no-shutdown" has been
+# .. note:: If the command-line option ``-no-shutdown`` has been
# specified, qemu will not exit, and a STOP event will eventually
# follow the SHUTDOWN event.
#
diff --git a/qapi/sockets.json b/qapi/sockets.json
index 3970118bf4..4d78d2ccb7 100644
--- a/qapi/sockets.json
+++ b/qapi/sockets.json
@@ -181,7 +181,7 @@
#
# .. note:: This type is deprecated in favor of SocketAddress. The
# difference between SocketAddressLegacy and SocketAddress is that
-# the latter has fewer {} on the wire.
+# the latter has fewer ``{}`` on the wire.
#
# Since: 1.3
##
diff --git a/qapi/ui.json b/qapi/ui.json
index a1999965e4..5bcccbfc93 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1268,7 +1268,7 @@
# Since: 2.6
#
# .. note:: The consoles are visible in the qom tree, under
-# /backend/console[$index]. They have a device link and head
+# ``/backend/console[$index]``. They have a device link and head
# property, so it is possible to map which console belongs to which
# device and display.
#
--
2.45.0
next prev parent reply other threads:[~2024-07-06 7:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-06 7:24 [PULL 00/13] QAPI patches patches for 2024-07-06 Markus Armbruster
2024-07-06 7:24 ` [PULL 01/13] qapi: linter fixups Markus Armbruster
2024-07-06 7:24 ` [PULL 02/13] docs/qapidoc: remove unused intersperse function Markus Armbruster
2024-07-06 7:24 ` [PULL 03/13] docs/qapidoc: delint a tiny portion of the module Markus Armbruster
2024-07-06 7:24 ` [PULL 04/13] qapi/parser: preserve indentation in QAPIDoc sections Markus Armbruster
2024-07-06 7:24 ` [PULL 05/13] qapi/parser: fix comment parsing immediately following a doc block Markus Armbruster
2024-07-06 7:24 ` [PULL 06/13] docs/qapidoc: fix nested parsing under untagged sections Markus Armbruster
2024-07-06 7:24 ` [PULL 07/13] qapi: fix non-compliant JSON examples Markus Armbruster
2024-07-06 7:24 ` [PULL 08/13] qapi: nail down convention that Errors sections are lists Markus Armbruster
2024-07-06 7:24 ` [PULL 09/13] qapi: convert "Note" sections to plain rST Markus Armbruster
2024-07-06 7:24 ` [PULL 10/13] qapi: update prose in note blocks Markus Armbruster
2024-07-06 7:24 ` Markus Armbruster [this message]
2024-07-06 7:24 ` [PULL 12/13] qapi/parser: don't parse rST markup as section headers Markus Armbruster
2024-07-06 7:24 ` [PULL 13/13] sphinx/qapidoc: Fix to generate doc for explicit, unboxed arguments Markus Armbruster
2024-07-08 15:18 ` [PULL 00/13] QAPI patches patches for 2024-07-06 Richard Henderson
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=20240706072416.1717485-12-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=jsnow@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).