summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-02-20 17:42:47 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-02-20 17:42:47 +0000
commit56f9e46b841c7be478ca038d8d4085d776ab4b0d (patch)
tree9236b179a00b5b5ece25b328dfcb34299619264a /docs
parentc8f21dbfc3dea943ca5edac2f00058477ecb5b6b (diff)
parentfea346f569d4132296f7c26367374fcace80e096 (diff)
downloadqemu-56f9e46b841c7be478ca038d8d4085d776ab4b0d.tar.gz
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-02-20' into staging
QAPI patches for 2017-02-20 # gpg: Signature made Mon 20 Feb 2017 13:31:12 GMT # gpg: using RSA key 0x3870B400EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qapi-2017-02-20: Makefile: Put VERSION info into version.texi rather than using -D qapi2texi: replace quotation by bold section name Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
-rw-r--r--docs/qemu-ga-ref.texi2
-rw-r--r--docs/qemu-qmp-ref.texi2
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/qemu-ga-ref.texi b/docs/qemu-ga-ref.texi
index 87cc8d01a5..ddb76ce1c2 100644
--- a/docs/qemu-ga-ref.texi
+++ b/docs/qemu-ga-ref.texi
@@ -1,6 +1,8 @@
\input texinfo
@setfilename qemu-ga-ref.info
+@include version.texi
+
@exampleindent 0
@paragraphindent 0
diff --git a/docs/qemu-qmp-ref.texi b/docs/qemu-qmp-ref.texi
index 818e52573b..0a0056930a 100644
--- a/docs/qemu-qmp-ref.texi
+++ b/docs/qemu-qmp-ref.texi
@@ -1,6 +1,8 @@
\input texinfo
@setfilename qemu-qmp-ref.info
+@include version.texi
+
@exampleindent 0
@paragraphindent 0