Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1524210 > unrolled thread

[PATCH] doc: Document the new inline struct member kernel-doc style

Started byDaniel Vetter <daniel.vetter@ffwll.ch>
First post2016-11-17 10:50 +0100
Last post2016-11-19 18:40 +0100
Articles 6 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] doc: Document the new inline struct member kernel-doc style Daniel Vetter <daniel.vetter@ffwll.ch> - 2016-11-17 10:50 +0100
    Re: [PATCH] doc: Document the new inline struct member kernel-doc style Jani Nikula <jani.nikula@intel.com> - 2016-11-17 11:00 +0100
      Re: [PATCH] doc: Document the new inline struct member kernel-doc style Jani Nikula <jani.nikula@intel.com> - 2016-11-17 11:10 +0100
    [PATCH] doc: Document the new inline struct member kernel-doc style Daniel Vetter <daniel.vetter@ffwll.ch> - 2016-11-17 11:30 +0100
      Re: [PATCH] doc: Document the new inline struct member kernel-doc style Jani Nikula <jani.nikula@intel.com> - 2016-11-17 11:30 +0100
      Re: [PATCH] doc: Document the new inline struct member kernel-doc  style Jonathan Corbet <corbet@lwn.net> - 2016-11-19 18:40 +0100

#1524210 — [PATCH] doc: Document the new inline struct member kernel-doc style

FromDaniel Vetter <daniel.vetter@ffwll.ch>
Date2016-11-17 10:50 +0100
Subject[PATCH] doc: Document the new inline struct member kernel-doc style
Message-ID<sEruq-7iB-17@gated-at.bofh.it>
We don't just need better doc toolchains, we also need better docs for
our doc toolchain!

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
-- 
2.10.2

[toc] | [next] | [standalone]

#1524218

FromJani Nikula <jani.nikula@intel.com>
Date2016-11-17 11:00 +0100
Message-ID<sErE6-7my-9@gated-at.bofh.it>
In reply to#1524210
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.

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

[toc] | [prev] | [next] | [standalone]

#1524231

FromJani Nikula <jani.nikula@intel.com>
Date2016-11-17 11:10 +0100
Message-ID<sErNN-7If-43@gated-at.bofh.it>
In reply to#1524218
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

[toc] | [prev] | [next] | [standalone]

#1524234

FromDaniel Vetter <daniel.vetter@ffwll.ch>
Date2016-11-17 11:30 +0100
Message-ID<sEs77-7Sn-3@gated-at.bofh.it>
In reply to#1524210
We don't just need better doc toolchains, we also need better docs for
our doc toolchain!

v2: Make sure we don't have foo twice (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..0dd17069bc0b 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;
+        /** @foobar: Single line description. */
+        int foobar;
   }
 
 Private members
-- 
2.10.2

[toc] | [prev] | [next] | [standalone]

#1524235

FromJani Nikula <jani.nikula@intel.com>
Date2016-11-17 11:30 +0100
Message-ID<sEs77-7Sn-1@gated-at.bofh.it>
In reply to#1524234
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!
>
> v2: Make sure we don't have foo twice (Jani).

Thanks, *now* LGTM. :)

>
> 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..0dd17069bc0b 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;
> +        /** @foobar: Single line description. */
> +        int foobar;
>    }
>  
>  Private members

-- 
Jani Nikula, Intel Open Source Technology Center

[toc] | [prev] | [next] | [standalone]

#1526087 — Re: [PATCH] doc: Document the new inline struct member kernel-doc style

FromJonathan Corbet <corbet@lwn.net>
Date2016-11-19 18:40 +0100
SubjectRe: [PATCH] doc: Document the new inline struct member kernel-doc style
Message-ID<sFhMm-7VK-17@gated-at.bofh.it>
In reply to#1524234
On Thu, 17 Nov 2016 11:19:43 +0100
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> We don't just need better doc toolchains, we also need better docs for
> our doc toolchain!

Indeed.  Applied, thanks.

jon

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web