From: Matthieu Baerts <matttbe@kernel.org>
To: Donald Hunter <donald.hunter@gmail.com>
Cc: Jonathan Corbet <corbet@lwn.net>,
Jakub Kicinski <kuba@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
linux-doc@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next] tools: ynl: rst: display attribute-set doc
Date: Thu, 11 Sep 2025 18:59:08 +0200 [thread overview]
Message-ID: <a1f55940-7115-4650-835c-2f1138c5eaa4@kernel.org> (raw)
In-Reply-To: <m2v7lpuv2w.fsf@gmail.com>
Hi Donald,
On 11/09/2025 12:44, Donald Hunter wrote:
> "Matthieu Baerts (NGI0)" <matttbe@kernel.org> writes:
>
>> Some attribute-set have a documentation (doc:), but it was not displayed
>> in the RST / HTML version. Such field can be found in ethtool, netdev,
>> tcp_metrics and team YAML files.
>>
>> Only the 'name' and 'attributes' fields from an 'attribute-set' section
>> were parsed. Now the content of the 'doc' field, if available, is added
>> as a new paragraph before listing each attribute. This is similar to
>> what is done when parsing the 'operations'.
>
> This fix looks good, but exposes the same issue with the team
> attribute-set in team.yaml.
Good catch! I forgot to check why the output was like that before
sending this patch.
> The following patch is sufficient to generate output that sphinx doesn't
> mangle:
>
> diff --git a/Documentation/netlink/specs/team.yaml b/Documentation/netlink/specs/team.yaml
> index cf02d47d12a4..fae40835386c 100644
> --- a/Documentation/netlink/specs/team.yaml
> +++ b/Documentation/netlink/specs/team.yaml
> @@ -25,7 +25,7 @@ definitions:
> attribute-sets:
> -
> name: team
> - doc:
> + doc: |
> The team nested layout of get/set msg looks like
> [TEAM_ATTR_LIST_OPTION]
> [TEAM_ATTR_ITEM_OPTION]
Yes, that's enough to avoid the mangled output in .rst and .html files.
Do you plan to send this patch, or do you prefer if I send it? As part
of another series or do you prefer a v2?
Note that a few .yaml files have the doc definition starting at the next
line, but without this '|' at the end. It looks strange to me to have
the string defined at the next line like that. I was thinking about
sending patches containing modifications created by the following
command, but I see that this way of writing the string value is valid in
YAML.
$ git grep -l "doc:$" -- Documentation/netlink/specs | \
xargs sed -i 's/doc:$/doc: |/g'
Except the one with "team", the other ones don't have their output
mangled. So such modifications are probably not needed for the other ones.
Cheers,
Matt
--
Sponsored by the NGI0 Core fund.
next prev parent reply other threads:[~2025-09-11 16:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-10 12:55 Matthieu Baerts (NGI0)
2025-09-11 10:44 ` Donald Hunter
2025-09-11 16:59 ` Matthieu Baerts [this message]
2025-09-12 11:07 ` Donald Hunter
2025-09-12 13:05 ` Matthieu Baerts
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=a1f55940-7115-4650-835c-2f1138c5eaa4@kernel.org \
--to=matttbe@kernel.org \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=donald.hunter@gmail.com \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/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®