Skip to content

Commit 8ed292f

Browse files
author
Jonathan Corbet
committed
docs: deprecate kernel-doc-nano-HOWTO.txt
Now that the new Sphinx world order is taking over, the information in kernel-doc-nano-HOWTO.txt is outmoded. I hate to remove it altogether, since it's one of those files that people expect to find. But we can add a warning and fix all the other pointers to it. Reminded-by: Daniel Vetter <[email protected]> Signed-off-by: Jonathan Corbet <[email protected]>
1 parent 47d6d75 commit 8ed292f

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

Documentation/00-INDEX

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ kbuild/
255255
- directory with info about the kernel build process.
256256
kdump/
257257
- directory with mini HowTo on getting the crash dump code to work.
258-
kernel-doc-nano-HOWTO.txt
259-
- mini HowTo on generation and location of kernel documentation files.
260258
kernel-docs.txt
261259
- listing of various WWW + books that document kernel internals.
260+
kernel-documentation.rst
261+
- how to write and format reStructuredText kernel documentation
262262
kernel-parameters.txt
263263
- summary listing of command line / boot prompt args for the kernel.
264264
kernel-per-CPU-kthreads.txt

Documentation/CodingStyle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ of the function, telling people what it does, and possibly WHY it does
458458
it.
459459

460460
When commenting the kernel API functions, please use the kernel-doc format.
461-
See the files Documentation/kernel-doc-nano-HOWTO.txt and scripts/kernel-doc
461+
See the files Documentation/kernel-documentation.rst and scripts/kernel-doc
462462
for details.
463463

464464
Linux style for comments is the C89 "/* ... */" style.

Documentation/development-process/4.Coding

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ which have not been so documented, there is no harm in adding kerneldoc
346346
comments for the future; indeed, this can be a useful activity for
347347
beginning kernel developers. The format of these comments, along with some
348348
information on how to create kerneldoc templates can be found in the file
349-
Documentation/kernel-doc-nano-HOWTO.txt.
349+
Documentation/kernel-documentation.rst.
350350

351351
Anybody who reads through a significant amount of existing kernel code will
352352
note that, often, comments are most notable by their absence. Once again,

Documentation/kernel-doc-nano-HOWTO.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
NOTE: this document is outdated and will eventually be removed. See
2+
Documentation/kernel-documentation.rst for current information.
3+
14
kernel-doc nano-HOWTO
25
=====================
36

Documentation/zh_CN/CodingStyle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ C是一个简朴的语言,你的命名也应该这样。和 Modula-2 和 Pasca
399399
些事情的原因。
400400

401401
当注释内核API函数时,请使用 kernel-doc 格式。请看
402-
Documentation/kernel-doc-nano-HOWTO.txt和scripts/kernel-doc 以获得详细信息。
402+
Documentation/kernel-documentation.rst和scripts/kernel-doc 以获得详细信息。
403403

404404
Linux的注释风格是 C89 “/* ... */” 风格。不要使用 C99 风格 “// ...” 注释。
405405

0 commit comments

Comments
 (0)