summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2025-02-11 06:57:57 +0100
committerJonathan Corbet <corbet@lwn.net>2025-02-13 09:47:44 -0700
commitde61d6515baece4610e401d9d7c18cac6bd77198 (patch)
treee350a41a90e077a83ef0d07ffdf829e72e657fc2
parent6a0c4b61e13f9ab1d6395823fb06b0763eb370bd (diff)
docs: ABI: move README contents to the top
The ABI documentation looks a little bit better if it starts with the contents of the README is placed at the beginning. Move it to the beginning of the ABI chapter. While here, improve the README text and change the title that will be shown at the html/pdf output to be coherent with both ABI file contents and with the generated documentation output. Suggested-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Link: https://lore.kernel.org/r/20250211055809.1898623-1-mchehab+huawei@kernel.org Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--Documentation/ABI/README3
-rw-r--r--Documentation/admin-guide/abi-readme-file.rst6
-rw-r--r--Documentation/admin-guide/abi.rst3
-rw-r--r--scripts/lib/abi/abi_parser.py2
4 files changed, 5 insertions, 9 deletions
diff --git a/Documentation/ABI/README b/Documentation/ABI/README
index 8bac9cb09a6d..ef0e6d11e919 100644
--- a/Documentation/ABI/README
+++ b/Documentation/ABI/README
@@ -1,4 +1,5 @@
-This directory attempts to document the ABI between the Linux kernel and
+This part of the documentation inside Documentation/ABI directory
+attempts to document the ABI between the Linux kernel and
userspace, and the relative stability of these interfaces. Due to the
everchanging nature of Linux, and the differing maturity levels, these
interfaces should be used by userspace programs in different ways.
diff --git a/Documentation/admin-guide/abi-readme-file.rst b/Documentation/admin-guide/abi-readme-file.rst
deleted file mode 100644
index 6172e4ccbda2..000000000000
--- a/Documentation/admin-guide/abi-readme-file.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0
-
-ABI README
-==========
-
-.. kernel-abi:: README
diff --git a/Documentation/admin-guide/abi.rst b/Documentation/admin-guide/abi.rst
index 15a2dcb1388c..c6039359e585 100644
--- a/Documentation/admin-guide/abi.rst
+++ b/Documentation/admin-guide/abi.rst
@@ -4,6 +4,8 @@
Linux ABI description
=====================
+.. kernel-abi:: README
+
ABI symbols
-----------
@@ -21,7 +23,6 @@ ABI files
.. toctree::
:maxdepth: 2
- abi-readme-file
abi-stable-files
abi-testing-files
abi-obsolete-files
diff --git a/scripts/lib/abi/abi_parser.py b/scripts/lib/abi/abi_parser.py
index f08de6d3bf7c..66a738013ce1 100644
--- a/scripts/lib/abi/abi_parser.py
+++ b/scripts/lib/abi/abi_parser.py
@@ -266,7 +266,7 @@ class AbiParser:
def parse_readme(self, nametag, fname):
"""Parse ABI README file"""
- nametag["what"] = ["ABI file contents"]
+ nametag["what"] = ["Introduction"]
nametag["path"] = "README"
with open(fname, "r", encoding="utf8", errors="backslashreplace") as fp:
for line in fp: