summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Armbruster2015-09-24 18:11:55 +0200
committerMarkus Armbruster2015-10-12 18:44:53 +0200
commit9b89b6a2872f1473ef82acdcb64c901982e0ef88 (patch)
treeb0485d618a200b6f9d1d427f3f7af89066c99644
parentMerge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff)
downloadqemu-9b89b6a2872f1473ef82acdcb64c901982e0ef88.tar.gz
qemu-9b89b6a2872f1473ef82acdcb64c901982e0ef88.tar.xz
qemu-9b89b6a2872f1473ef82acdcb64c901982e0ef88.zip
docs: Move files from docs/qmp/ to docs/
Giving QMP its own subdirectory in docs/ is hardly worthwhile when we have just four files, and one of them isn't even in the subdirectory. Move the files from docs/qmp/ to docs/, renaming docs/qmp/README to docs/qmp-intro. Update MAINTAINERS. The new pattern also captures the fourth file docs/writing-qmp-commands.txt. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1443111117-29831-2-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
-rw-r--r--MAINTAINERS2
-rw-r--r--docs/qmp-events.txt (renamed from docs/qmp/qmp-events.txt)0
-rw-r--r--docs/qmp-intro.txt (renamed from docs/qmp/README)0
-rw-r--r--docs/qmp-spec.txt (renamed from docs/qmp/qmp-spec.txt)0
4 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9bde8328e0..79ffe883a1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1095,7 +1095,7 @@ S: Supported
F: qmp.c
F: monitor.c
F: qmp-commands.hx
-F: docs/qmp/
+F: docs/*qmp-*
F: scripts/qmp/
T: git git://repo.or.cz/qemu/armbru.git qapi-next
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp-events.txt
index d92cc4833b..d92cc4833b 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp-events.txt
diff --git a/docs/qmp/README b/docs/qmp-intro.txt
index f6a3a031e9..f6a3a031e9 100644
--- a/docs/qmp/README
+++ b/docs/qmp-intro.txt
diff --git a/docs/qmp/qmp-spec.txt b/docs/qmp-spec.txt
index 4c28cd9438..4c28cd9438 100644
--- a/docs/qmp/qmp-spec.txt
+++ b/docs/qmp-spec.txt