summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-04-03 08:51:51 +0000
committerintrigeri <intrigeri@boum.org>2019-04-03 08:51:51 +0000
commit6df20e2966dd7d6e29cecd1baed3722fe6aeaeb3 (patch)
tree294bc0d3028720c06f523b9aa67fb706e965561a
parent83974621f35fd6cfddc9e3344d6741f0a8db4a92 (diff)
Fix typos and grammar mistakes.
-rw-r--r--wiki/src/contribute/merge_policy/review.mdwn4
-rw-r--r--wiki/src/contribute/merge_policy/submit.mdwn6
2 files changed, 5 insertions, 5 deletions
diff --git a/wiki/src/contribute/merge_policy/review.mdwn b/wiki/src/contribute/merge_policy/review.mdwn
index f6d7243..6a68254 100644
--- a/wiki/src/contribute/merge_policy/review.mdwn
+++ b/wiki/src/contribute/merge_policy/review.mdwn
@@ -24,8 +24,8 @@
maintenance includes: polishing the proposed changes to make them fit
for release; writing and updating the design and end-user
documentations; fixing bugs.
-- As reviewer, you are allowed to to trival checks e.g. {typos in,phrasing of}
- comments and string on top of the proposed patch to avoid rountrips.
+- As reviewer, you are allowed to commit trivial fixes e.g. {typos in,phrasing of}
+ comments and strings on top of the proposed patch to avoid round-trips.
You need to report back those changes.
- Remember that it's hard to receive negative feedback. Don't forget
to note the good parts, be constructive and precise in your
diff --git a/wiki/src/contribute/merge_policy/submit.mdwn b/wiki/src/contribute/merge_policy/submit.mdwn
index 4a613c7..8ed7aab 100644
--- a/wiki/src/contribute/merge_policy/submit.mdwn
+++ b/wiki/src/contribute/merge_policy/submit.mdwn
@@ -5,7 +5,7 @@ be named `feature/XXX`. For a bugfix about YYY, it should be named
`bugfix/YYY`. Ideally, include the relevant ticket number in the topic
branch name, e.g. `bugfix/7173-upgrade-syslinux`.
-When you think it is good enough and has tested it, you have to:
+When you think it is good enough and have tested it, you have to:
- Set the ticket's *Status* field to *In Progress* (if you do not see
this field when editing the ticket, ask the [[sysadmin team|contribute/working_together/roles/sysadmins]]
@@ -37,6 +37,6 @@ more dev* or *Needs more info* state, and
from now on it's the responsibility of the branch/ticket "holder" to
change it back to *Ready for QA* once they consider the issues raised by
the reviewer are fixed. The reviewer is allowed to add trivial changes,
-e.g. {typos in,phrasing of} comments and string on top of the proposed patch
-to avoid roundtrips. But the reviewer needs to communicate those changes to
+e.g. {typos in,phrasing of} comments and strings on top of the proposed patch
+to avoid round-trips. But the reviewer needs to communicate those changes to
the branch/ticket "holder".