summaryrefslogtreecommitdiffstats
path: root/Documentation/doc-guide
diff options
context:
space:
mode:
authorSheriff Esseson <sheriffesseson@gmail.com>2019-06-28 08:20:01 +0200
committerJonathan Corbet <corbet@lwn.net>2019-06-28 17:04:14 +0200
commit9159ba14285c5432063a0ad83e50afb95674d9b1 (patch)
treefd08e4b02bfc7ce43af7e4947bc2315a1b85681b /Documentation/doc-guide
parentMerge branch 'automarkup' into docs-next (diff)
downloadlinux-9159ba14285c5432063a0ad83e50afb95674d9b1.tar.xz
linux-9159ba14285c5432063a0ad83e50afb95674d9b1.zip
Doc : doc-guide : Fix a typo
fix the disjunction by replacing "of" with "or". Signed-off-by: Sheriff Esseson <sheriffesseson@gmail.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/doc-guide')
-rw-r--r--Documentation/doc-guide/kernel-doc.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/doc-guide/kernel-doc.rst b/Documentation/doc-guide/kernel-doc.rst
index f96059767c8c..192c36af39e2 100644
--- a/Documentation/doc-guide/kernel-doc.rst
+++ b/Documentation/doc-guide/kernel-doc.rst
@@ -359,7 +359,7 @@ Domain`_ references.
``monospaced font``.
Useful if you need to use special characters that would otherwise have some
- meaning either by kernel-doc script of by reStructuredText.
+ meaning either by kernel-doc script or by reStructuredText.
This is particularly useful if you need to use things like ``%ph`` inside
a function description.