summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails translators <tails-l10n@boum.org>2019-06-26 11:20:07 +0000
committerTails translators <tails-l10n@boum.org>2019-06-26 11:20:07 +0000
commit8c013a2dfb0b8dbb599eb6b5cff7b56c0064f0ff (patch)
tree44855eef855e1445012d68623f0c86e7159e2c09
parent6640c60ae5446efb7e95f76a6ad282a1632b7bfc (diff)
parente6e21acbb5606c2247b7dd19dd621a1d8dfd72f5 (diff)
merge with main git using update-weblate-git.
-rw-r--r--wiki/src/contribute/how/code/HACKING.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiki/src/contribute/how/code/HACKING.mdwn b/wiki/src/contribute/how/code/HACKING.mdwn
index 4997d68..3ac2797 100644
--- a/wiki/src/contribute/how/code/HACKING.mdwn
+++ b/wiki/src/contribute/how/code/HACKING.mdwn
@@ -2,7 +2,7 @@
Hi, prospective Tails contributor! This document is intended to
quickly (in 20 minutes!) get you up to speed on how to write code for
-Tails by giving a brief overview the Tails source tree and Git branch
+Tails by giving a brief overview of the Tails source tree and Git branch
organization without referring to more detailed (and hence longer)
resources. As such it might not be enough for some specific things,
but it should cover 95% of use cases for aspiring code
@@ -33,7 +33,7 @@ you have something to contribute, please read our
new such branches should be based on `stable`.
* `testing`: After a freeze for a new major release (e.g. when we
- prepare release candidates), this is the branch were the continued
+ prepare release candidates), this is the branch where the continued
work for this release happens. At that point `devel` is used for the
*next* major release. Bugfixes on new features introduced in the
this upcoming Tails release should be based on this branch (as