1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/kernel-doc-nano-HOWTO.txt b/Documentation/kernel-doc-nano-HOWTO.txt
index 4d04572b6549..348b9e5e28fc 100644
--- a/Documentation/kernel-doc-nano-HOWTO.txt
+++ b/Documentation/kernel-doc-nano-HOWTO.txt
@@ -66,7 +66,9 @@ Example kernel-doc function comment:
 * The longer description can have multiple paragraphs.
 */
-The first line, with the short description, must be on a single line.
+The short description following the subject can span multiple lines
+and ends with an @argument description, an empty line or the end of
+the comment block.
 The @argument descriptions must begin on the very next line following
 this opening short function description line, with no intervening

diff --git a/Documentation/kernel-doc-nano-HOWTO.txt b/Documentation/kernel-doc-nano-HOWTO.txt index 4d04572b6549..348b9e5e28fc 100644 --- a/Documentation/kernel-doc-nano-HOWTO.txt +++ b/Documentation/kernel-doc-nano-HOWTO.txt
@@ -66,7 +66,9 @@ Example kernel-doc function comment:
66	* The longer description can have multiple paragraphs.	66	* The longer description can have multiple paragraphs.
67	*/	67	*/
68		68
69	The first line, with the short description, must be on a single line.	69	The short description following the subject can span multiple lines
		70	and ends with an @argument description, an empty line or the end of
		71	the comment block.
70		72
71	The @argument descriptions must begin on the very next line following	73	The @argument descriptions must begin on the very next line following
72	this opening short function description line, with no intervening	74	this opening short function description line, with no intervening