From: Jani Nikula <jani.nikula@intel.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
LKML <linux-kernel@vger.kernel.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Daniel Vetter <daniel@ffwll.ch>, Jonathan Corbet <corbet@lwn.net>,
linux-doc@vger.kernel.org,
Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH] doc: Document the new inline struct member kernel-doc style
Date: Thu, 17 Nov 2016 12:05:26 +0200 [thread overview]
Message-ID: <8737iq1kwp.fsf@intel.com> (raw)
In-Reply-To: <8760nm1lay.fsf@intel.com>
On Thu, 17 Nov 2016, Jani Nikula <jani.nikula@intel.com> wrote:
> On Thu, 17 Nov 2016, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>> We don't just need better doc toolchains, we also need better docs for
>> our doc toolchain!
>
> Mea culpa. Thanks, LGTM.
Oh, the example struct now has too "foo" fields, documented
twice. That's not good.
BR,
Jani.
>
> BR,
> Jani.
>
>
>> Cc: Daniel Vetter <daniel@ffwll.ch>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> Cc: Jonathan Corbet <corbet@lwn.net>
>> Cc: linux-doc@vger.kernel.org
>> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>> ---
>> Documentation/kernel-documentation.rst | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/Documentation/kernel-documentation.rst b/Documentation/kernel-documentation.rst
>> index 10cc7ddb6235..a5bd12d8bd4e 100644
>> --- a/Documentation/kernel-documentation.rst
>> +++ b/Documentation/kernel-documentation.rst
>> @@ -484,7 +484,10 @@ span multiple lines. The continuation lines may contain indentation.
>> In-line member documentation comments
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> -The structure members may also be documented in-line within the definition::
>> +The structure members may also be documented in-line within the definition.
>> +There are two styles, single-line comments where both the opening ``/**`` and
>> +closing ``*/`` are on the same line, and multi-line comments where they are each
>> +on a line of their own, like all other kernel-doc comments::
>>
>> /**
>> * struct foo - Brief description.
>> @@ -502,6 +505,8 @@ The structure members may also be documented in-line within the definition::
>> * Here, the member description may contain several paragraphs.
>> */
>> int baz;
>> + /** @foo: Single line description. */
>> + int foo;
>> }
>>
>> Private members
--
Jani Nikula, Intel Open Source Technology Center
next prev parent reply other threads:[~2016-11-17 10:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-17 9:43 [PATCH] doc: Document the new inline struct member kernel-doc style Daniel Vetter
2016-11-17 9:56 ` Jani Nikula
2016-11-17 10:05 ` Jani Nikula [this message]
2016-11-17 10:19 ` Daniel Vetter
2016-11-17 10:23 ` Jani Nikula
2016-11-19 17:32 ` Jonathan Corbet
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=8737iq1kwp.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=corbet@lwn.net \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=daniel@ffwll.ch \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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