From fbe044ddf664d0cf7a97d7dd5cf6a30fac720b9e Mon Sep 17 00:00:00 2001
From: Daniele Nicolodi <daniele@grinta.net>
Date: Wed, 23 Aug 2023 21:48:09 +0200
Subject: [PATCH] DOC: merge Security section into about.rst and rename to
 Packages

---
 docs/about.rst    | 23 +++++++++++++++++++++++
 docs/index.rst    |  1 -
 docs/security.rst | 27 ---------------------------
 3 files changed, 23 insertions(+), 28 deletions(-)
 delete mode 100644 docs/security.rst

diff --git a/docs/about.rst b/docs/about.rst
index c022916be..bc7c56e31 100644
--- a/docs/about.rst
+++ b/docs/about.rst
@@ -31,3 +31,26 @@ Ralf Gommers contributes to the development of ``meson-python`` as
 part of their job at `Quansight`__.
 
 __ https://www.quansight.com/
+
+
+Packages
+========
+
+``meson-python`` packages are distriburted via `PyPI`_ as Python wheel
+for Python 3.7 and later.
+
+Distributors are recommended to fetch release sources from the
+corresponding tags on the Git repository_ or from source distributions
+on `PyPI`_. Git tags are PGP-signed with one of the following keys:
+
+- |3DCE51D60930EBA47858BA4146F633CBB0EB4BF2|_ Filipe Laíns
+- |52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5|_ Ralf Gommers
+
+.. _repository: https://github.com/mesonbuild/meson-python
+.. _PyPI: https://pypi.org/project/meson-python/
+
+.. |3DCE51D60930EBA47858BA4146F633CBB0EB4BF2| replace:: ``3DCE51D60930EBA47858BA4146F633CBB0EB4BF2``
+.. _3DCE51D60930EBA47858BA4146F633CBB0EB4BF2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3dce51d60930eba47858ba4146f633cbb0eb4bf2
+
+.. |52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5| replace:: ``52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5``
+.. _52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5: https://github.com/rgommers.gpg
diff --git a/docs/index.rst b/docs/index.rst
index e1da30d89..11876d194 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -111,7 +111,6 @@ for quick questions - one ``meson-python`` maintainer is active there.
 
    changelog
    about
-   security
    contributing/index
    Source Code <https://github.com/mesonbuild/meson-python>
    Issue Tracker <https://github.com/mesonbuild/meson-python/issues>
diff --git a/docs/security.rst b/docs/security.rst
deleted file mode 100644
index cb46768b8..000000000
--- a/docs/security.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-.. SPDX-FileCopyrightText: 2023 The meson-python developers
-..
-.. SPDX-License-Identifier: MIT
-
-
-.. _security:
-
-********
-Security
-********
-
-Distributors are recommended to fetch release sources via the Git tags
-on our repository_, or the source distributions on `PyPI`_. Git tags
-are PGP-signed with one of the following keys:
-
-- |3DCE51D60930EBA47858BA4146F633CBB0EB4BF2|_ Filipe Laíns
-- |52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5|_ Ralf Gommers
-
-
-.. _repository: https://github.com/mesonbuild/meson-python
-.. _PyPI: https://pypi.org/project/meson-python/
-
-.. |3DCE51D60930EBA47858BA4146F633CBB0EB4BF2| replace:: ``3DCE51D60930EBA47858BA4146F633CBB0EB4BF2``
-.. _3DCE51D60930EBA47858BA4146F633CBB0EB4BF2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3dce51d60930eba47858ba4146f633cbb0eb4bf2
-
-.. |52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5| replace:: ``52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5``
-.. _52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5: https://github.com/rgommers.gpg