diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 10:28:58 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 10:28:58 -0700 |
| commit | ca9667fcc855676aa5c35978f201034d38790829 (patch) | |
| tree | f52523e399b6938fd79b0b0c25b3c55e27600e55 /Documentation/process | |
| parent | 38f985e3c9bb33d5422103807eb0a54f4ad39a0d (diff) | |
| parent | 2dde123b23ceba4b6d0d780b4e9fdcfb94621747 (diff) | |
Merge branch 'mauro-doc' into docs-next
Diffstat (limited to 'Documentation/process')
| -rw-r--r-- | Documentation/process/4.Coding.rst | 4 | ||||
| -rw-r--r-- | Documentation/process/coding-style.rst | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/process/4.Coding.rst b/Documentation/process/4.Coding.rst index 983d628c1112..2a728d898fc5 100644 --- a/Documentation/process/4.Coding.rst +++ b/Documentation/process/4.Coding.rst @@ -358,8 +358,8 @@ them, as appropriate, for externally-available functions. Even in areas which have not been so documented, there is no harm in adding kerneldoc comments for the future; indeed, this can be a useful activity for beginning kernel developers. The format of these comments, along with some -information on how to create kerneldoc templates can be found in the file -Documentation/kernel-documentation.rst. +information on how to create kerneldoc templates can be found at +:ref:`Documentation/doc-guide/ <doc_guide>`. Anybody who reads through a significant amount of existing kernel code will note that, often, comments are most notable by their absence. Once again, diff --git a/Documentation/process/coding-style.rst b/Documentation/process/coding-style.rst index 3e7905172000..d20d52a4d812 100644 --- a/Documentation/process/coding-style.rst +++ b/Documentation/process/coding-style.rst @@ -525,8 +525,8 @@ of the function, telling people what it does, and possibly WHY it does it. When commenting the kernel API functions, please use the kernel-doc format. -See the files Documentation/kernel-documentation.rst and scripts/kernel-doc -for details. +See the files at :ref:`Documentation/doc-guide/ <doc_guide>` and +``scripts/kernel-doc`` for details. The preferred style for long (multi-line) comments is: |