From 30694a7db402a79cf2659e28e5b52817fc4dd02c Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Sat, 10 Feb 2007 01:45:53 -0800
Subject: [PATCH] --- yaml --- r: 47577 b: refs/heads/master c:
 891dcd2f7ab15e2aaad07f6925b3a53fd8d5c02f h: refs/heads/master i:   47575:
 122293de26173eecf79c6eb84d74c9e41c4775e5 v: v3

---
 [refs]                                        | 2 +-
 trunk/Documentation/kernel-doc-nano-HOWTO.txt | 2 +-
 trunk/scripts/kernel-doc                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2e3637f95538..40266b795d4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3de3af130b75a79c7381573e5ea69cb59502023f
+refs/heads/master: 891dcd2f7ab15e2aaad07f6925b3a53fd8d5c02f
diff --git a/trunk/Documentation/kernel-doc-nano-HOWTO.txt b/trunk/Documentation/kernel-doc-nano-HOWTO.txt
index 284e7e198e93..6ca507f40749 100644
--- a/trunk/Documentation/kernel-doc-nano-HOWTO.txt
+++ b/trunk/Documentation/kernel-doc-nano-HOWTO.txt
@@ -101,7 +101,7 @@ The format of the block comment is like this:
 
 /**
  * function_name(:)? (- short description)?
-(* @parameterx: (description of parameter x)?)*
+(* @parameterx(space)*: (description of parameter x)?)*
 (* a blank line)?
  * (Description:)? (Description of function)?
  * (section header: (section description)? )*
diff --git a/trunk/scripts/kernel-doc b/trunk/scripts/kernel-doc
index 8a4ec43a4985..35d7fd9a1e65 100755
--- a/trunk/scripts/kernel-doc
+++ b/trunk/scripts/kernel-doc
@@ -83,7 +83,7 @@ use strict;
 #  * my_function
 #  **/
 #
-# If the Description: header tag is ommitted, then there must be a blank line
+# If the Description: header tag is omitted, then there must be a blank line
 # after the last parameter specification.
 # e.g.
 # /**
@@ -265,7 +265,7 @@ my $doc_start = '^/\*\*\s*$'; # Allow whitespace at end of comment start.
 my $doc_end = '\*/';
 my $doc_com = '\s*\*\s*';
 my $doc_decl = $doc_com.'(\w+)';
-my $doc_sect = $doc_com.'(['.$doc_special.']?[\w ]+):(.*)';
+my $doc_sect = $doc_com.'(['.$doc_special.']?[\w\s]+):(.*)';
 my $doc_content = $doc_com.'(.*)';
 my $doc_block = $doc_com.'DOC:\s*(.*)?';