summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/how
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/src/contribute/how')
-rw-r--r--wiki/src/contribute/how/code.mdwn2
-rw-r--r--wiki/src/contribute/how/documentation.mdwn13
-rw-r--r--wiki/src/contribute/how/translate/team/fr.mdwn2
-rw-r--r--wiki/src/contribute/how/translate/with_Git.mdwn15
4 files changed, 21 insertions, 11 deletions
diff --git a/wiki/src/contribute/how/code.mdwn b/wiki/src/contribute/how/code.mdwn
index 3367a46..32f30a3 100644
--- a/wiki/src/contribute/how/code.mdwn
+++ b/wiki/src/contribute/how/code.mdwn
@@ -98,7 +98,7 @@ So you know what bug you want to fix, what feature you want to
implement. At this point, we advise you to:
1. **Gather results of previous research and discussions** on the
- topic you are interested in. Search this wiki, [[!tails_redmine ""
+ topic you are interested in. Search this website, [[!tails_redmine ""
desc="tickets on Redmine"]] and the [developers mailing-list
archive](https://mailman.boum.org/pipermail/tails-dev/).
2. **[[Tell us|contribute/talk]] about your plans** to make sure your
diff --git a/wiki/src/contribute/how/documentation.mdwn b/wiki/src/contribute/how/documentation.mdwn
index db2a55e..6bf40ae 100644
--- a/wiki/src/contribute/how/documentation.mdwn
+++ b/wiki/src/contribute/how/documentation.mdwn
@@ -28,10 +28,11 @@ But there are still many ways you can start contributing:
[[ask us for review|contribute/talk]].
- Small fixes and enhancements to the current documentation are
- greatly welcome. This can be done by [[sending us|contribute/talk]]
- Git patches, by publishing a [[Git]] branch, or simply by email on
- the public mailing list. In the general case, this work should be
- based on the `master` branch.
+ greatly welcome. This can be done by sending Git patches to [[the
+ tails-dev mailing list|contribute/talk]] or by publishing a
+ [[Git]] branch (for example to a fork on
+ [GitLab](https://gitlab.com/Tails/tails)). In general,
+ documentation changes should be based on the `master` branch.
Documentation writers coordinate themselves using our usual
[[development communication channels|contribute/talk]].
@@ -39,6 +40,10 @@ Documentation writers coordinate themselves using our usual
Documentation writers should also read our [[documentation
guidelines|guidelines]].
+New documentation should be wrapped to 80 characters; however, please
+do not submit patches that merely re-wrap existing text, as this makes
+it harder to read the git history.
+
We recommend you to [[build an offline version of the
documentation|contribute/build/website]] to test your contributions
before sharing them with us.
diff --git a/wiki/src/contribute/how/translate/team/fr.mdwn b/wiki/src/contribute/how/translate/team/fr.mdwn
index 90b4ef9..8516849 100644
--- a/wiki/src/contribute/how/translate/team/fr.mdwn
+++ b/wiki/src/contribute/how/translate/team/fr.mdwn
@@ -35,6 +35,8 @@ For French, various bits of text can be translated via Git:
* matsa: [[https://git-tails.immerda.ch/matsa/tails]]
* mercedes508: [[https://git-tails.immerda.ch/mercedes508]]
* seb35: [[https://git-tails.immerda.ch/seb35]]
+* elouann: [[http://git.tails.boum.org/elouann/tails/]]
+ * PGP fingerprint: `4C95 4E38 AC95 9C33 BD03 7A09 A29F 43F4 830F 0A36`
# Glossaries
diff --git a/wiki/src/contribute/how/translate/with_Git.mdwn b/wiki/src/contribute/how/translate/with_Git.mdwn
index d5e09e8..991c6bc 100644
--- a/wiki/src/contribute/how/translate/with_Git.mdwn
+++ b/wiki/src/contribute/how/translate/with_Git.mdwn
@@ -18,7 +18,7 @@ If you want to use another operating system, these tools are:
* Git - manage source code
* Poedit - translate files
* OpenSSH client - publish your translations on the server
-* tools to [[build the wiki locally|contribute/build/website/]] in
+* tools to [[build a local copy of the website|contribute/build/website/]] in
order to check how it will look like
If you do not use Tails, please ensure that you use at least version 1.5 of Poedit,
@@ -86,7 +86,7 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad
git clone https://git-tails.immerda.ch/tails
- This operation requires some time at setup, as it requires to pull the whole repository.
+ This operation requires some time at setup, as it requires pulling the whole repository.
3. **Add your repository**
@@ -96,7 +96,9 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad
To publish your translations, you need to add the repository set up previously.
The URL of your repository should look like `tails@git.tails.boum.org:elouann/tails`.
- If you cannot find the URL of your repository, get in touch with the sysadmins or send an email on the [[mailing list|translate#follow-up]]. Once you got it, add it to the repositories:
+ If you cannot find the URL of your repository, get in touch with the sysadmins or send
+ an email to the [[mailing list|translate#follow-up]]. Once you've got it, add it to
+ your local repository:
git remote add myrepo tails@git.tails.boum.org:elouann/tails
@@ -112,11 +114,12 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad
origin https://git-tails.immerda.ch/tails (fetch)
origin https://git-tails.immerda.ch/tails (push)
- To check if the repository are correctly configured, run the following command:
+ To check if the repository is correctly configured, run the following command:
git fetch --all
- If you have problem with SSH keys or with the URL of your repository, get in touch with the sysadmins or send an email on the [[mailing list|translate#follow-up]].
+ If you have a problem with SSH keys or with the URL of your repository, get in touch
+ with the sysadmins or send an email to the [[mailing list|translate#follow-up]].
3. **Configure your credentials**
@@ -144,7 +147,7 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad
5. **Translate!**
- You can use your preferred PO file editor, possibly *Poedit* which is included in Tails.
+ You can use your preferred PO file editor, for example, *Poedit* which is included in Tails.
6. **Save your translations**