Ey there: I have added a little documentation about the purpose of the master branch (#9528)
please review! repo: https://git-tails.immerda.ch/emmapeel/tails/ branch: feature/9528-document_master_branch commit: fc4ae42577550272227e3dcd1062589a38b28ec0 The repository should be good now, just in case also patch attached
From fc4ae42577550272227e3dcd1062589a38b28ec0 Mon Sep 17 00:00:00 2001 From: Debian Live user <[email protected]> Date: Thu, 4 Jun 2015 08:24:46 +0000 Subject: [PATCH] First draft for #9528 --- wiki/src/contribute/git.mdwn | 15 ++++++++++++--- wiki/src/contribute/how/translate.mdwn | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/wiki/src/contribute/git.mdwn b/wiki/src/contribute/git.mdwn index 678af42..2a0ca96 100644 --- a/wiki/src/contribute/git.mdwn +++ b/wiki/src/contribute/git.mdwn @@ -102,17 +102,26 @@ Developers with write access to the repositories should: git config --global [email protected]:.insteadOf \ https://git-tails.immerda.ch/ +<a id="branches"></a> + ### Branches Tails development uses several branches modeled a bit like the Debian development process. Here they are. +<a id="master_branch"></a> + #### master -The `master` branch is used by the online wiki. +The `master` branch is mostly used to build the online wiki. + +It receives: -**FIXME**: document what should go in there, when other branches are -merged into it, etc. +- Documentation [[improvements|contribute/how/documentation]] that + affects current Tails (e.g. not the next Tails release) +- [[New translations|contribute/how/translate#website]] added to the website. +- When [[releasing a new Tails|contribute/release_process/]], the branch + it was built from (stable or testing). #### stable diff --git a/wiki/src/contribute/how/translate.mdwn b/wiki/src/contribute/how/translate.mdwn index 06b6ba2..cf504dc 100644 --- a/wiki/src/contribute/how/translate.mdwn +++ b/wiki/src/contribute/how/translate.mdwn @@ -30,6 +30,8 @@ programs into your native language: Transifex|translate/with_Transifex]]. Tails programs can be translated into more than 140 languages this way. +<a id="website"></a> + # Translate this website You can also translate this website, which includes the Tails -- 1.7.10.4
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Tails-dev mailing list [email protected] https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to [email protected].
