From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Linux Doc Mailing List <linux-doc@vger.kernel.org>,
Jonathan Corbet <corbet@lwn.net>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
"Randy Dunlap" <rdunlap@infradead.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH v6 4/6] docs: kernel-doc.rst: don't let automarkup mangle with consts
Date: Tue, 16 Dec 2025 15:19:26 +0100 [thread overview]
Message-ID: <a6adfa3d775c1dccc9f80a7b82be003cbc0051d2.1765894670.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1765894670.git.mchehab+huawei@kernel.org>
This document contains several words that tricks automarkup.
Ensure that all of them will be inside a ``const`` markup,
avoiding automarkup to touch them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
---
Documentation/doc-guide/kernel-doc.rst | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/Documentation/doc-guide/kernel-doc.rst b/Documentation/doc-guide/kernel-doc.rst
index fd89a6d56ea9..2e18a810f98b 100644
--- a/Documentation/doc-guide/kernel-doc.rst
+++ b/Documentation/doc-guide/kernel-doc.rst
@@ -174,7 +174,8 @@ named ``Return`` (or ``Returns``).
Structure, union, and enumeration documentation
-----------------------------------------------
-The general format of a struct, union, and enum kernel-doc comment is::
+The general format of a ``struct``, ``union``, and ``enum`` kernel-doc
+comment is::
/**
* struct struct_name - Brief description.
@@ -187,8 +188,8 @@ The general format of a struct, union, and enum kernel-doc comment is::
*/
You can replace the ``struct`` in the above example with ``union`` or
-``enum`` to describe unions or enums. ``member`` is used to mean struct
-and union member names as well as enumerations in an enum.
+``enum`` to describe unions or enums. ``member`` is used to mean ``struct``
+and ``union`` member names as well as enumerations in an ``enum``.
The brief description following the structure name may span multiple
lines, and ends with a member description, a blank comment line, or the
@@ -201,7 +202,7 @@ Members of structs, unions and enums should be documented the same way
as function parameters; they immediately succeed the short description
and may be multi-line.
-Inside a struct or union description, you can use the ``private:`` and
+Inside a ``struct`` or ``union`` description, you can use the ``private:`` and
``public:`` comment tags. Structure fields that are inside a ``private:``
area are not listed in the generated output documentation.
@@ -273,11 +274,11 @@ It is possible to document nested structs and unions, like::
.. note::
- #) When documenting nested structs or unions, if the struct/union ``foo``
- is named, the member ``bar`` inside it should be documented as
+ #) When documenting nested structs or unions, if the ``struct``/``union``
+ ``foo`` is named, the member ``bar`` inside it should be documented as
``@foo.bar:``
- #) When the nested struct/union is anonymous, the member ``bar`` in it
- should be documented as ``@bar:``
+ #) When the nested ``struct``/``union`` is anonymous, the member ``bar`` in
+ it should be documented as ``@bar:``
In-line member documentation comments
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -319,7 +320,7 @@ on a line of their own, like all other kernel-doc comments::
Typedef documentation
---------------------
-The general format of a typedef kernel-doc comment is::
+The general format of a ``typedef`` kernel-doc comment is::
/**
* typedef type_name - Brief description.
@@ -432,8 +433,8 @@ Domain`_ references.
Typedef reference.
``&struct_name->member`` or ``&struct_name.member``
- Structure or union member reference. The cross-reference will be to the struct
- or union definition, not the member directly.
+ ``struct`` or ``union`` member reference. The cross-reference will be to the
+ ``struct`` or ``union`` definition, not the member directly.
``&name``
A generic type reference. Prefer using the full reference described above
@@ -537,7 +538,7 @@ identifiers: *[ function/type ...]*
Include documentation for each *function* and *type* in *source*.
If no *function* is specified, the documentation for all functions
and types in the *source* will be included.
- *type* can be a struct, union, enum, or typedef identifier.
+ *type* can be a ``struct``, ``union``, ``enum``, or ``typedef`` identifier.
Examples::
--
2.52.0
next prev parent reply other threads:[~2025-12-16 14:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-16 14:19 [PATCH v6 0/6] kernel-doc: add support for documenting vars Mauro Carvalho Chehab
2025-12-16 14:19 ` [PATCH v6 1/6] kernel-doc: add support for handling global variables Mauro Carvalho Chehab
2025-12-16 14:19 ` [PATCH v6 2/6] kernel-doc: add support to handle DEFINE_ variables Mauro Carvalho Chehab
2025-12-16 14:19 ` [PATCH v6 3/6] docs: media: v4l2-ioctl.h: document two global variables Mauro Carvalho Chehab
2025-12-16 14:19 ` Mauro Carvalho Chehab [this message]
2025-12-16 14:19 ` [PATCH v6 5/6] docs: kernel-doc.rst: document the new "var" kernel-doc markup Mauro Carvalho Chehab
2025-12-16 14:19 ` [PATCH v6 6/6] docs: kernel-doc.rst: Parse DEFINE_ macros without prefixes Mauro Carvalho Chehab
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=a6adfa3d775c1dccc9f80a7b82be003cbc0051d2.1765894670.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@infradead.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
all inboxes | Powered by JetHome®