diff options
| author | Richard Henderson | 2021-11-08 14:56:10 +0100 |
|---|---|---|
| committer | Richard Henderson | 2021-11-08 14:56:10 +0100 |
| commit | 260f9210d2ce892c5e162a45b0e5ec0036bedc79 (patch) | |
| tree | d6262096025eab3b09fbd16e6c3588ed70fc5e83 /qapi | |
| parent | Merge remote-tracking branch 'remotes/juanquintela/tags/migration-20211106-pu... (diff) | |
| parent | docs/sphinx: change default role to "any" (diff) | |
| download | qemu-260f9210d2ce892c5e162a45b0e5ec0036bedc79.tar.gz qemu-260f9210d2ce892c5e162a45b0e5ec0036bedc79.tar.xz qemu-260f9210d2ce892c5e162a45b0e5ec0036bedc79.zip | |
Merge remote-tracking branch 'remotes/marcandre.lureau/tags/sphinx-pull-request' into staging
Some Sphinx improvements
PR for 2 series:
https://patchew.org/QEMU/20211015105344.152591-1-marcandre.lureau@redhat.com/
https://patchew.org/QEMU/20211004215238.1523082-1-jsnow@redhat.com/
# gpg: Signature made Mon 08 Nov 2021 10:01:03 AM CET
# gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg: issuer "marcandre.lureau@redhat.com"
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
* remotes/marcandre.lureau/tags/sphinx-pull-request:
docs/sphinx: change default role to "any"
docs: (further) remove non-reference uses of single backticks
docs: remove non-reference uses of single backticks
docs/sphinx: add 's' keyboard binding to focus search
docs/sphinx: set navigation_with_keys=True
meson: drop sphinx_template_files
meson: drop sphinx_extn_depends
tests/qapi-schema/meson: add depfile to sphinx doc
docs/sphinx: add templates files to generated depfile
docs/sphinx: add static files to generated depfile
docs/sphinx: add loaded modules to generated depfile
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index b290782bf2..33e8507d10 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -491,11 +491,11 @@ # @granularity: granularity of the dirty bitmap in bytes (since 1.4) # # @recording: true if the bitmap is recording new writes from the guest. -# Replaces `active` and `disabled` statuses. (since 4.0) +# Replaces ``active`` and ``disabled`` statuses. (since 4.0) # # @busy: true if the bitmap is in-use by some operation (NBD or jobs) # and cannot be modified via QMP or used by another operation. -# Replaces `locked` and `frozen` statuses. (since 4.0) +# Replaces ``locked`` and ``frozen`` statuses. (since 4.0) # # @persistent: true if the bitmap was stored on disk, is scheduled to be stored # on disk, or both. (since 4.0) |