summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-10-21 10:26:09 +0000
committersajolida <sajolida@pimienta.org>2015-10-21 10:26:09 +0000
commitfc5502abf5681271eed1e02cd724d62dc057014b (patch)
tree90360bc78a4420899af2cffa28a5b83b31bae845
parent212d6a83148c082acfc518943ed33c44ac5d18ec (diff)
parent87dd55a93df1d7a61996fcbde215c519726e58b5 (diff)
Merge remote-tracking branch 'jessew/doc_fixes3' into devel
Conflicts: wiki/src/contribute/release_process.mdwn
-rw-r--r--wiki/src/contribute/how/translate/with_Git.mdwn13
-rw-r--r--wiki/src/contribute/release_process.mdwn4
-rw-r--r--wiki/src/contribute/release_process/liveusb-creator.mdwn4
-rw-r--r--wiki/src/contribute/release_process/liveusb-creator/topic_branch.mdwn2
4 files changed, 13 insertions, 10 deletions
diff --git a/wiki/src/contribute/how/translate/with_Git.mdwn b/wiki/src/contribute/how/translate/with_Git.mdwn
index fc7b81f..991c6bc 100644
--- a/wiki/src/contribute/how/translate/with_Git.mdwn
+++ b/wiki/src/contribute/how/translate/with_Git.mdwn
@@ -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**
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 7a94c19..58c1d15 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -696,8 +696,8 @@ ISO history
-----------
Push the released ISO to our Tails ISO history git-annex repo, so that
-our isotesters can fetch it from there and not fail to test because of
-it missing. How to do it is described in our internal Git repo.
+our isotesters can fetch it from there for their testing. How to do so
+is described in our internal Git repo.
Update the website and Git repository
=====================================
diff --git a/wiki/src/contribute/release_process/liveusb-creator.mdwn b/wiki/src/contribute/release_process/liveusb-creator.mdwn
index 1f5c1f4..0ebafad 100644
--- a/wiki/src/contribute/release_process/liveusb-creator.mdwn
+++ b/wiki/src/contribute/release_process/liveusb-creator.mdwn
@@ -39,7 +39,7 @@ Packaging
We're using [DEP-14 conventions](http://dep.debian.net/deps/dep14/),
except for our `master` branch which is used for upstream development
-targetted at current Tails, as said above. More specifically:
+targeted at current Tails, as said above. More specifically:
* The `pristine-tar` branch contains the binary delta between DFSG-freed
tarballs and the corresponding tag. It's automatically maintained by
@@ -144,7 +144,7 @@ Extract the upstream and packaging branch from gbp.conf:
Create a DFSG-compatible tarball from the previously created Git
archive and reimport it into the source tree. This merges, into the
`debian-branch` specified in `gbp.conf`, not only the commit that
-imported the current DFSG free upstream tarball into the
+imported the current DFSG-free upstream tarball into the
`upstream-branch`, but also the corresponding upstream Git history:
mk-origtargz \
diff --git a/wiki/src/contribute/release_process/liveusb-creator/topic_branch.mdwn b/wiki/src/contribute/release_process/liveusb-creator/topic_branch.mdwn
index 190ee93..33ee944 100644
--- a/wiki/src/contribute/release_process/liveusb-creator/topic_branch.mdwn
+++ b/wiki/src/contribute/release_process/liveusb-creator/topic_branch.mdwn
@@ -7,7 +7,7 @@ Let's say you want to build a package for a topic branch called
If your topic branch has been forked off a different branch than
<code>master</code>, then you need to adjust the following
-instructions a bit: not only you need to replace occurrences of
+instructions a bit: not only do you need to replace occurrences of
<code>master</code>, but your <code>TARGET_DIST</code> will also
be different.