summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJonathan Corbet2019-06-28 17:02:55 +0200
committerJonathan Corbet2019-06-28 17:02:55 +0200
commit8abc2a12c83b42cba6e7ac38cf6178585ae1783e (patch)
tree50fcf5a0ac277d98d22d67aaeb243d9e85c90bc6 /scripts
parentplatform: x86: get rid of a non-existent document (diff)
parentdocs: Note that :c:func: should no longer be used (diff)
downloadkernel-qcow2-linux-8abc2a12c83b42cba6e7ac38cf6178585ae1783e.tar.gz
kernel-qcow2-linux-8abc2a12c83b42cba6e7ac38cf6178585ae1783e.tar.xz
kernel-qcow2-linux-8abc2a12c83b42cba6e7ac38cf6178585ae1783e.zip
Merge branch 'automarkup' into docs-next
Bring in (finally) automatic markup of function() so we need not load up our docs with ugly c:func: annotations.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/kernel-doc2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index c0cb41e65b9b..6b03012750da 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -249,7 +249,7 @@ my @highlights_rst = (
[$type_member_func, "\\:c\\:type\\:`\$1\$2\$3\\\\(\\\\) <\$1>`"],
[$type_member, "\\:c\\:type\\:`\$1\$2\$3 <\$1>`"],
[$type_fp_param, "**\$1\\\\(\\\\)**"],
- [$type_func, "\\:c\\:func\\:`\$1()`"],
+ [$type_func, "\$1()"],
[$type_enum, "\\:c\\:type\\:`\$1 <\$2>`"],
[$type_struct, "\\:c\\:type\\:`\$1 <\$2>`"],
[$type_typedef, "\\:c\\:type\\:`\$1 <\$2>`"],