aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-07-22 20:20:16 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-08-02 11:42:38 +0100
commit4e0b15c25228d14c55bdd482e11a1b351d00191b (patch)
tree98614f552cacb67ba84e4181df1943965c1c6dd2
parent199a4363056a205c5a770802323aa22c1555c2b8 (diff)
downloadqemu-4e0b15c25228d14c55bdd482e11a1b351d00191b.zip
qemu-4e0b15c25228d14c55bdd482e11a1b351d00191b.tar.gz
qemu-4e0b15c25228d14c55bdd482e11a1b351d00191b.tar.bz2
docs: Move licence/copyright from HTML output to rST comments
Our built HTML documentation now has a standard footer which gives the license for QEMU (and its documentation as a whole). In almost all pages, we either don't bother to state the copyright/license for the individual rST sources, or we put it in an rST comment. There are just three pages which render copyright or license information into the user-visible HTML. Quoting a specific (different) license for an individual HTML page within the manual is confusing. Downgrade the license and copyright info to a comment within the rST source, bringing these pages in line with the rest of our documents. Suggested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Cleber Rosa <crosa@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 20210722192016.24915-3-peter.maydell@linaro.org
-rw-r--r--docs/interop/vhost-user-gpu.rst7
-rw-r--r--docs/interop/vhost-user.rst12
-rw-r--r--docs/system/generic-loader.rst4
3 files changed, 13 insertions, 10 deletions
diff --git a/docs/interop/vhost-user-gpu.rst b/docs/interop/vhost-user-gpu.rst
index 3268bf4..71a2c52 100644
--- a/docs/interop/vhost-user-gpu.rst
+++ b/docs/interop/vhost-user-gpu.rst
@@ -2,9 +2,10 @@
Vhost-user-gpu Protocol
=======================
-:Licence: This work is licensed under the terms of the GNU GPL,
- version 2 or later. See the COPYING file in the top-level
- directory.
+..
+ Licence: This work is licensed under the terms of the GNU GPL,
+ version 2 or later. See the COPYING file in the top-level
+ directory.
.. contents:: Table of Contents
diff --git a/docs/interop/vhost-user.rst b/docs/interop/vhost-user.rst
index 7fc6935..edc3ad8 100644
--- a/docs/interop/vhost-user.rst
+++ b/docs/interop/vhost-user.rst
@@ -3,11 +3,13 @@
===================
Vhost-user Protocol
===================
-:Copyright: 2014 Virtual Open Systems Sarl.
-:Copyright: 2019 Intel Corporation
-:Licence: This work is licensed under the terms of the GNU GPL,
- version 2 or later. See the COPYING file in the top-level
- directory.
+
+..
+ Copyright 2014 Virtual Open Systems Sarl.
+ Copyright 2019 Intel Corporation
+ Licence: This work is licensed under the terms of the GNU GPL,
+ version 2 or later. See the COPYING file in the top-level
+ directory.
.. contents:: Table of Contents
diff --git a/docs/system/generic-loader.rst b/docs/system/generic-loader.rst
index 531ddbc..4f9fb00 100644
--- a/docs/system/generic-loader.rst
+++ b/docs/system/generic-loader.rst
@@ -1,8 +1,8 @@
..
Copyright (c) 2016, Xilinx Inc.
-This work is licensed under the terms of the GNU GPL, version 2 or later. See
-the COPYING file in the top-level directory.
+ This work is licensed under the terms of the GNU GPL, version 2 or later. See
+ the COPYING file in the top-level directory.
Generic Loader
--------------