Re: [Tails-dev] [review'n'merge][website] documentation on master branch
emmapeel: > sajolida: >> >> Maybe I would: >> >> * Also mention improvements to the website (other than documentation. >> Its structure, graphic design, other sections, etc.). > > I added a new line with links to news and security advisory > >> * Replace 'wiki' by 'website'. I understand from working with new >> contributors that it's weird to call our website a wiki when it's not >> really one (from a contributor's perspective). So I think we should >> progressively stop using the term 'wiki'. > > Good point! Zoom too high... > >> * Always beware of 'it'. I think you last bullet point would have been >> clearer for me you said "When releasing a new Tails, the branch the >> release was built from (stable or testing)." > > /me runs to read the Microsoft documentation guidelines again... > >> * Rephrase "Translations added to the website" into "Translations of the >> website" would save you a word :) > > Ok branch has been updated: > > ta...@git.tails.boum.org:emmapeel/tails > a74f8c8..6c1fbb5 feature/9528-document_master_branch > > https://labs.riseup.net/code/issues/9528 Merge (with some nitpicking on top), thanks! -- sajolida ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] [review'n'merge][website] documentation on master branch
yo! sajolida: > > Maybe I would: > > * Also mention improvements to the website (other than documentation. > Its structure, graphic design, other sections, etc.). I added a new line with links to news and security advisory > * Replace 'wiki' by 'website'. I understand from working with new > contributors that it's weird to call our website a wiki when it's not > really one (from a contributor's perspective). So I think we should > progressively stop using the term 'wiki'. Good point! Zoom too high... > * Always beware of 'it'. I think you last bullet point would have been > clearer for me you said "When releasing a new Tails, the branch the > release was built from (stable or testing)." /me runs to read the Microsoft documentation guidelines again... > * Rephrase "Translations added to the website" into "Translations of the > website" would save you a word :) Ok branch has been updated: ta...@git.tails.boum.org:emmapeel/tails a74f8c8..6c1fbb5 feature/9528-document_master_branch https://labs.riseup.net/code/issues/9528 signature.asc Description: OpenPGP digital signature ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] [review'n'merge][website] documentation on master branch
emmapeel: > intrigeri: >> >> Yay! >> >> Here are a few initial comments to keep the ball rolling: >> > Hello: > > Thanks for the suggestions. The branch has been updated. Any other > suggestions? > > BitingBird, sajolida? It looks good! Maybe I would: * Also mention improvements to the website (other than documentation. Its structure, graphic design, other sections, etc.). * Replace 'wiki' by 'website'. I understand from working with new contributors that it's weird to call our website a wiki when it's not really one (from a contributor's perspective). So I think we should progressively stop using the term 'wiki'. * Always beware of 'it'. I think you last bullet point would have been clearer for me you said "When releasing a new Tails, the branch the release was built from (stable or testing)." * Rephrase "Translations added to the website" into "Translations of the website" would save you a word :) Other than that, I'd merge it. -- sajolida ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] [review'n'merge][website] documentation on master branch
intrigeri: > > Yay! > > Here are a few initial comments to keep the ball rolling: > Hello: Thanks for the suggestions. The branch has been updated. Any other suggestions? BitingBird, sajolida? Cheers signature.asc Description: OpenPGP digital signature ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] [review'n'merge][website] documentation on master branch
Hi, emmapeel wrote (04 Jun 2015 08:51:07 GMT) : > I have added a little documentation about the purpose of the master > branch (#9528) Yay! Here are a few initial comments to keep the ball rolling: * "It receives" isn't very clear to me. Below you're listing things we are merging into master. * s/affects/affect/ (grammar fix) * Typography (trailing period, etc.) is not consistent accross the bullet list that's added. * "New translations" is overly precise: other kinds of translation improvements also make their way into master. Cheers! ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
[Tails-dev] [review'n'merge][website] documentation on master branch
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 Date: Thu, 4 Jun 2015 08:24:46 + 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 url.ta...@git.tails.boum.org:.insteadOf \ https://git-tails.immerda.ch/ + + ### Branches Tails development uses several branches modeled a bit like the Debian development process. Here they are. + + 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. + + # 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 Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
