From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Alistair Francis" <alistair@alistair23.me>,
"Markus Armbruster" <armbru@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PATCH for-6.1 2/2] docs: Move licence/copyright from HTML output to rST comments
Date: Thu, 22 Jul 2021 20:20:16 +0100 [thread overview]
Message-ID: <20210722192016.24915-3-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210722192016.24915-1-peter.maydell@linaro.org>
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>
---
docs/interop/vhost-user-gpu.rst | 7 ++++---
docs/interop/vhost-user.rst | 12 +++++++-----
docs/system/generic-loader.rst | 4 ++--
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/docs/interop/vhost-user-gpu.rst b/docs/interop/vhost-user-gpu.rst
index 3268bf405ce..71a2c52b313 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 d6085f70452..d63f8d3f93a 100644
--- a/docs/interop/vhost-user.rst
+++ b/docs/interop/vhost-user.rst
@@ -1,11 +1,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 531ddbc8e34..4f9fb005f1d 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
--------------
--
2.20.1
next prev parent reply other threads:[~2021-07-22 19:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 19:20 [PATCH for-6.1 0/2] docs license footer followon cleanups Peter Maydell
2021-07-22 19:20 ` [PATCH for-6.1 1/2] docs: Remove stale TODO comments about license and version Peter Maydell
2021-07-22 21:50 ` Cleber Rosa
2021-07-23 8:08 ` Markus Armbruster
2021-07-22 19:20 ` Peter Maydell [this message]
2021-07-22 21:53 ` [PATCH for-6.1 2/2] docs: Move licence/copyright from HTML output to rST comments Cleber Rosa
2021-07-23 7:47 ` Michael S. Tsirkin
2021-07-23 8:08 ` Markus Armbruster
2021-07-22 19:46 ` [PATCH for-6.1 0/2] docs license footer followon cleanups Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210722192016.24915-3-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=alistair@alistair23.me \
--cc=armbru@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).