---
htdocs/codingconventions.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/htdocs/codingconventions.html b/htdocs/codingconventions.html
index e4d30510..86b63b89 100644
--- a/htdocs/codingconventions.html
+++ b/htdocs/codingconventions.html
@@ -141,7 +141,7 @@ a large batch of changes.</p>
supported formats: <code>a/b/c/ChangeLog</code>,
<code>a/b/c/ChangeLog:</code>, <code>a/b/c/</code> (where ChangeLog
file lives in the folder), <code>\ta/b/c/</code> and
<code>a/b/c</code></li>
<li><code>pr_entry</code> - bug report reference <br>
example: <code>\tPR component/12345</code></li>
- <li><code>changelog_file</code> - a modified file mentined in a ChangeLog:
+ <li><code>changelog_file</code> - a modified file mentioned in a ChangeLog:
supported formats: <code>\t* a/b/c/file.c:</code>, <code>\t*
a/b/c/file.c (function):</code>, <code>\t* a/b/c/file1.c,
a/b/c/file2.c:</code></li>
<li><code>changelog_file_comment</code> - line that follows a
<code>changelog_file</code> with description of changes in the file;
must start with <code>\t</code></li>
@@ -153,7 +153,7 @@ a large batch of changes.</p>
<h3>Format rules</h3>
<ul>
- <li><code>git_description</code> - optional; ends right before
one of the other compoments is found</li>
+ <li><code>git_description</code> - optional; ends right before
one of the other components is found</li>
<li><code>committer_timestamp</code> - optional; when found
before a <code>changelog_file</code>, then it is added
to each changelog entry</li>
<li><code>additional_author</code> - optional</li>
@@ -1022,7 +1022,7 @@ intended to last a long time.
<p>
Complex hierarchies are to be avoided.
Take special care with multiple inheritance.
-On the rare occasion that using mulitple inheritance is indeed useful,
+On the rare occasion that using multiple inheritance is indeed useful,
prepare design rationales in advance,
and take special care to make documentation of the entire hierarchy clear.
(In particular, multiple inheritance can be an acceptable way of combining
--
2.25.1
