aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2017-11-21 12:04:34 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-11-21 13:34:13 +0000
commit1b3bbc68872be5b618811db9dae611373c49f823 (patch)
tree83d6d9b991e538ba89166da28f3780c674a2a34b /docs
parentd0dead3b6df7f6cd970ed02e8369ab8730aac9d3 (diff)
downloadqemu-1b3bbc68872be5b618811db9dae611373c49f823.zip
qemu-1b3bbc68872be5b618811db9dae611373c49f823.tar.gz
qemu-1b3bbc68872be5b618811db9dae611373c49f823.tar.bz2
Use qemu.org domain name
The owner of qemu.org has delegated authority to modify DNS records to the QEMU Project. This has allowed us to use the domain name without worries about IP address changes or technical issues disrupting service. The issues described in commit 859389810910f232188675d2f10b15f1aad77660 ("Use qemu-project.org domain name") have therefore been mitigated. This patch switches back to consistently using qemu.org instead of qemu-project.org in documentation, version.rc, and the Windows installer script. The git submodules and SeaBIOS still use qemu-project.org for the time being. This will be fixed in the QEMU 2.12 release cycle. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 20171121120435.28728-2-stefanha@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
-rw-r--r--docs/interop/qmp-intro.txt2
-rw-r--r--docs/rdma.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/interop/qmp-intro.txt b/docs/interop/qmp-intro.txt
index 60deafb..f1b60bc 100644
--- a/docs/interop/qmp-intro.txt
+++ b/docs/interop/qmp-intro.txt
@@ -83,4 +83,4 @@ Please, refer to the qapi-schema.json file for a complete command reference.
QMP wiki page
-------------
-http://wiki.qemu-project.org/QMP
+http://wiki.qemu.org/QMP
diff --git a/docs/rdma.txt b/docs/rdma.txt
index 2bdd0a5..f3eaaa0 100644
--- a/docs/rdma.txt
+++ b/docs/rdma.txt
@@ -1,7 +1,7 @@
(RDMA: Remote Direct Memory Access)
RDMA Live Migration Specification, Version # 1
==============================================
-Wiki: http://wiki.qemu-project.org/Features/RDMALiveMigration
+Wiki: http://wiki.qemu.org/Features/RDMALiveMigration
Github: git@github.com:hinesmr/qemu.git, 'rdma' branch
Copyright (C) 2013 Michael R. Hines <mrhines@us.ibm.com>