qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 06/21] docs: Move licence/copyright from HTML output to rST comments
Date: Mon,  2 Aug 2021 12:57:57 +0100	[thread overview]
Message-ID: <20210802115812.10731-7-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210802115812.10731-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>
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
---
 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 7fc693521e5..edc3ad84a35 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 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



  parent reply	other threads:[~2021-08-02 12:08 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-02 11:57 [PULL 00/21] target-arm queue Peter Maydell
2021-08-02 11:57 ` [PULL 01/21] docs: Add documentation of Arm 'mainstone' board Peter Maydell
2021-08-02 11:57 ` [PULL 02/21] docs: Add documentation of Arm 'kzm' board Peter Maydell
2021-08-02 11:57 ` [PULL 03/21] docs: Add documentation of Arm 'imx25-pdk' board Peter Maydell
2021-08-02 11:57 ` [PULL 04/21] MAINTAINERS: Don't list Andrzej Zaborowski for various components Peter Maydell
2021-08-02 11:57 ` [PULL 05/21] docs: Remove stale TODO comments about license and version Peter Maydell
2021-08-02 11:57 ` Peter Maydell [this message]
2021-08-02 11:57 ` [PULL 07/21] docs/devel/build-system.rst: Format literals correctly Peter Maydell
2021-08-02 11:57 ` [PULL 08/21] docs/devel/build-system.rst: Correct typo in example code Peter Maydell
2021-08-02 11:58 ` [PULL 09/21] docs/devel/ebpf_rss.rst: Format literals correctly Peter Maydell
2021-08-02 11:58 ` [PULL 10/21] docs/devel/migration.rst: " Peter Maydell
2021-08-02 11:58 ` [PULL 11/21] docs/devel: " Peter Maydell
2021-08-02 11:58 ` [PULL 12/21] docs/system/s390x/protvirt.rst: " Peter Maydell
2021-08-02 11:58 ` [PULL 13/21] docs/system/arm/cpu-features.rst: " Peter Maydell
2021-08-02 11:58 ` [PULL 14/21] docs: " Peter Maydell
2021-08-02 11:58 ` [PULL 15/21] docs/about/removed-features: Fix markup error Peter Maydell
2021-08-02 11:58 ` [PULL 16/21] docs/tools/virtiofsd.rst: Delete stray backtick Peter Maydell
2021-08-02 11:58 ` [PULL 17/21] hw/arm/boot: Report error if there is no fw_cfg device in the machine Peter Maydell
2021-08-02 11:58 ` [PULL 18/21] docs: Move bootindex.txt into system section and rstify Peter Maydell
2021-08-02 11:58 ` [PULL 19/21] docs: Move the protocol part of barrier.txt into interop Peter Maydell
2021-08-02 11:58 ` [PULL 20/21] ui/input-barrier: Move TODOs from barrier.txt to a comment Peter Maydell
2021-08-02 11:58 ` [PULL 21/21] docs: Move user-facing barrier docs into system manual Peter Maydell
2021-08-02 13:51 ` [PULL 00/21] target-arm queue Peter Maydell

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=20210802115812.10731-7-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --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).