summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/src/contribute')
-rw-r--r--wiki/src/contribute/git.mdwn5
-rw-r--r--wiki/src/contribute/how/documentation/release_notes/template.mdwn23
-rw-r--r--wiki/src/contribute/release_process.mdwn2
-rw-r--r--wiki/src/contribute/release_process/test/automated_tests.mdwn3
4 files changed, 27 insertions, 6 deletions
diff --git a/wiki/src/contribute/git.mdwn b/wiki/src/contribute/git.mdwn
index a2c680a..10b7b2b 100644
--- a/wiki/src/contribute/git.mdwn
+++ b/wiki/src/contribute/git.mdwn
@@ -99,6 +99,11 @@ Developers with write access to the repositories should:
git config --global url.tails@git.tails.boum.org:.insteadOf \
https://git-tails.immerda.ch/
+We also recommend the following setting in your Tails clone since it
+otherwise is too easy to forget pushing updated submodules:
+
+ git config push.recurseSubmodules check
+
<a id="branches"></a>
### Branches
diff --git a/wiki/src/contribute/how/documentation/release_notes/template.mdwn b/wiki/src/contribute/how/documentation/release_notes/template.mdwn
index fe03829..df5c049 100644
--- a/wiki/src/contribute/how/documentation/release_notes/template.mdwn
+++ b/wiki/src/contribute/how/documentation/release_notes/template.mdwn
@@ -34,7 +34,7 @@ vulnerabilities|security/Numerous_security_holes_in_$VERSION-1]]. You should upg
- Update *Xyz* from 1.0.0 to [1.2.3].
-- Update Linux to 1.2.3. This should improve the support for newer
+- Update *Linux* to 1.2.3. This should improve the support for newer
hardware (graphics, Wi-Fi, etc.).
### Hardware support
@@ -65,18 +65,31 @@ See the list of [[long-standing issues|support/known_issues]].
# Get Tails $VERSION
-- To install, follow our [[installation instructions|install]].
+## To upgrade your Tails USB stick and keep your persistent storage
-- To upgrade, automatic upgrades are available from $VERSION-2, $VERSION-1, and $VERSION-1~rc1 to $VERSION.
+- Automatic upgrades are available from $VERSION-2, $VERSION-1, and $VERSION-1~rc1 to $VERSION.
XXX: Check which IUK will be available with:
git diff origin/master...origin/web/release-$VERSION wiki/src/upgrade/v1/Tails | grep "to_$VERSION"
- If you cannot do an automatic upgrade or if Tails fails to start after an
+- If you cannot do an automatic upgrade or if Tails fails to start after an
automatic upgrade, please try to do a [[manual upgrade|upgrade]].
-- Download Tails $VERSION:
+## To install Tails on a new USB stick
+
+Follow our installation instructions:
+
+ - [[Install from Windows|install/win]]
+ - [[Install from macOS|install/mac]]
+ - [[Install from Linux|install/linux]]
+
+<div class="caution"><p>All the data on this USB stick will be lost.</p></div>
+
+## To download only
+
+If you don't need installation or upgrade instructions, you can directly download
+Tails $VERSION:
- [[For USB sticks (USB image)|install/download]]
- [[For DVDs and virtual machines (ISO image)|install/download-iso]]
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 0f57553..81de7f4 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -453,6 +453,7 @@ Build the almost-final image
============================
1. [[Build ISO and USB images|contribute/build]] from the release branch.
+ Do _not_ set `keeprunning` nor `rescue` in `$TAILS_BUILD_OPTIONS`.
2. Carefully read the build logs to make sure nothing bad happened.
3. Keep the resulting build artifacts until the end of this release process.
4. Record where the manifest of needed packages is stored:
@@ -574,6 +575,7 @@ suite should be ready, so it is time to:
avoid that!
1. build the final image!
+ Do _not_ set `keeprunning` nor `rescue` in `$TAILS_BUILD_OPTIONS`.
1. Compare the new build manifest with the one from the previous,
almost final build:
diff --git a/wiki/src/contribute/release_process/test/automated_tests.mdwn b/wiki/src/contribute/release_process/test/automated_tests.mdwn
index 933f913..ca5df04 100644
--- a/wiki/src/contribute/release_process/test/automated_tests.mdwn
+++ b/wiki/src/contribute/release_process/test/automated_tests.mdwn
@@ -186,7 +186,8 @@ there's a number of steps that reconfigures the computer...
The identifier (`some_disk`) is later used if we want to plug it or
otherwise act on it. Note that all media created this way are backed
by [[!wikipedia qcow2]] images, which grow only as they consume
-capacity. All such media are destroyed after the feature ends.
+capacity. All such media can be destroyed after the feature ends
+by using "I create a temporary…" instead.
This step does not necessarily have to be run this early, but it does
if we want to plug it as a non-removable drive...