| From: |
| Daniel Vetter <daniel.vetter-AT-ffwll.ch> |
| To: |
| LKML <linux-kernel-AT-vger.kernel.org> |
| Subject: |
| [PATCH] doc: Document the new inline struct member kernel-doc style |
| Date: |
| Thu, 17 Nov 2016 11:19:43 +0100 |
| Message-ID: |
| <20161117101943.9137-1-daniel.vetter@ffwll.ch> |
| Cc: |
| Daniel Vetter <daniel.vetter-AT-ffwll.ch>, Daniel Vetter <daniel-AT-ffwll.ch>, Jani Nikula <jani.nikula-AT-intel.com>, Jonathan Corbet <corbet-AT-lwn.net>, linux-doc-AT-vger.kernel.org, Daniel Vetter <daniel.vetter-AT-intel.com> |
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