summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will@willthompson.co.uk>2018-08-07 14:16:46 +0000
committerWill Thompson <will@willthompson.co.uk>2018-08-07 15:19:01 +0100
commit103dc42b5ec134362db9b6dfb32edf10344e6769 (patch)
treed33fc552a89b843f430449cb63b013c50868b8ff
parent8798fa7fdfcb219d85e5f76b24f1de2dc75f688f (diff)
downloadweston-103dc42b5ec134362db9b6dfb32edf10344e6769.tar.gz
doc: fix typos in CONTRIBUTING.md
* Cover letters are no more; presumably the changes since the previous revision should be summarised in the MR * Code should be indented with tabs, not implemented with tabs Signed-off-by: Will Thompson <will@willthompson.co.uk>
-rw-r--r--CONTRIBUTING.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f2e4750d..7e22afab 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -85,7 +85,7 @@ We won't reject patches that lack S-o-b, but it is strongly recommended.
When you re-send patches, revised or not, it would be very good to document the
changes compared to the previous revision in the commit message and/or the
-cover letter. If you have already received Reviewed-by or Acked-by tags, you
+merge request. If you have already received Reviewed-by or Acked-by tags, you
should evaluate whether they still apply and include them in the respective
commit messages. Otherwise the tags may be lost, reviewers miss the credit they
deserve, and the patches may cause redundant review effort.
@@ -134,7 +134,7 @@ You should follow the style of the file you're editing. In general, we
try to follow the rules below.
**Note: this file uses spaces due to markdown rendering issues for tabs.
- Code must be implemented using tabs.**
+ Code must be indented using tabs.**
- indent with tabs, and a tab is always 8 characters wide
- opening braces are on the same line as the if statement;