aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-04-01 17:08:48 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-04-01 17:08:48 +0100
commit415fa2fe91e2a49fe8d56d6aacc8f8db82c74775 (patch)
tree69112f0167a7926dc7d735b9c2dbd879f6720fc2 /docs
parent00084bab87c43be20638de7f191d1a1faed134cc (diff)
parentd3a0bb7706520928f8493fabaee76532b5b1adb4 (diff)
Merge remote-tracking branch 'remotes/marcandre/tags/for-6.0-pull-request' into staging
For 6.0 misc patches under my radar. V2: - "tests: Add tests for yank with the chardev-change case" updated - drop the readthedoc theme patch # gpg: Signature made Thu 01 Apr 2021 12:54:52 BST # 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] # Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5 * remotes/marcandre/tags/for-6.0-pull-request: tests: Add tests for yank with the chardev-change case chardev: Fix yank with the chardev-change case chardev/char.c: Always pass id to chardev_new chardev/char.c: Move object_property_try_add_child out of chardev_new yank: Always link full yank code yank: Remove dependency on qiochannel docs: simplify each section title dbus-vmstate: Increase the size of input stream buffer used during load util: fix use-after-free in module_load_one Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
-rw-r--r--docs/devel/index.rst4
-rw-r--r--docs/interop/index.rst4
-rw-r--r--docs/specs/index.rst4
-rw-r--r--docs/system/index.rst4
-rw-r--r--docs/tools/index.rst4
-rw-r--r--docs/user/index.rst4
6 files changed, 12 insertions, 12 deletions
diff --git a/docs/devel/index.rst b/docs/devel/index.rst
index 416261505f..6cf7e2d233 100644
--- a/docs/devel/index.rst
+++ b/docs/devel/index.rst
@@ -1,8 +1,8 @@
.. This is the top level page for the 'devel' manual.
-QEMU Developer's Guide
-======================
+Developer Information
+=====================
This manual documents various parts of the internals of QEMU.
You only need to read it if you are interested in reading or
diff --git a/docs/interop/index.rst b/docs/interop/index.rst
index 95d56495f6..219a5e5fc5 100644
--- a/docs/interop/index.rst
+++ b/docs/interop/index.rst
@@ -1,8 +1,8 @@
.. This is the top level page for the 'interop' manual.
-QEMU System Emulation Management and Interoperability Guide
-===========================================================
+System Emulation Management and Interoperability
+================================================
This manual contains documents and specifications that are useful
for making QEMU interoperate with other software.
diff --git a/docs/specs/index.rst b/docs/specs/index.rst
index 1b0eb979d5..7b08314d33 100644
--- a/docs/specs/index.rst
+++ b/docs/specs/index.rst
@@ -1,8 +1,8 @@
.. This is the top level page for the 'specs' manual
-QEMU System Emulation Guest Hardware Specifications
-===================================================
+System Emulation Guest Hardware Specifications
+==============================================
Contents:
diff --git a/docs/system/index.rst b/docs/system/index.rst
index 6ad9c93806..02d0707181 100644
--- a/docs/system/index.rst
+++ b/docs/system/index.rst
@@ -1,8 +1,8 @@
.. This is the top level page for the 'system' manual.
-QEMU System Emulation User's Guide
-==================================
+System Emulation
+================
This manual is the overall guide for users using QEMU
for full system emulation (as opposed to user-mode emulation).
diff --git a/docs/tools/index.rst b/docs/tools/index.rst
index 3a5829c17a..d923834a73 100644
--- a/docs/tools/index.rst
+++ b/docs/tools/index.rst
@@ -1,8 +1,8 @@
.. This is the top level page for the 'tools' manual
-QEMU Tools Guide
-================
+Tools
+=====
Contents:
diff --git a/docs/user/index.rst b/docs/user/index.rst
index e030dadf65..a5b47459ec 100644
--- a/docs/user/index.rst
+++ b/docs/user/index.rst
@@ -1,8 +1,8 @@
.. This is the top level page for the 'user' manual.
-QEMU User Mode Emulation User's Guide
-=====================================
+User Mode Emulation
+===================
This manual is the overall guide for users using QEMU
for user-mode emulation. In this mode, QEMU can launch