summaryrefslogtreecommitdiffstats
path: root/wiki/src
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2020-11-18 19:16:34 +0000
committersajolida <sajolida@pimienta.org>2020-11-18 19:16:34 +0000
commit0bf7e2426a1590987a97f8b066d9cd1d06300374 (patch)
tree62211b2e1e70ae2d1659e8988b72d6a521fadcf9 /wiki/src
parentedbc621ffb351ae61194af00d367b06f41edb5b1 (diff)
parentb0d52a07e4f06e626ccc31228af89c78fa38ac23 (diff)
Merge branch 'doc/17879-doc-gmail-thunderbird'
Diffstat (limited to 'wiki/src')
-rw-r--r--wiki/src/contribute/design.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.mdwn20
-rw-r--r--wiki/src/install/expert/usb.ar.po2
-rw-r--r--wiki/src/install/expert/usb.ca.po2
-rw-r--r--wiki/src/install/expert/usb.de.po4
-rw-r--r--wiki/src/install/expert/usb.es.po4
-rw-r--r--wiki/src/install/expert/usb.fa.po2
-rw-r--r--wiki/src/install/expert/usb.fr.po4
-rw-r--r--wiki/src/install/expert/usb.id.po2
-rw-r--r--wiki/src/install/expert/usb.it.po4
-rw-r--r--wiki/src/install/expert/usb.mdwn2
-rw-r--r--wiki/src/install/expert/usb.pl.po2
-rw-r--r--wiki/src/install/expert/usb.pt.po2
-rw-r--r--wiki/src/install/expert/usb.ru.po2
-rw-r--r--wiki/src/install/expert/usb.sr_Latn.po2
-rw-r--r--wiki/src/install/expert/usb.tr.po2
-rw-r--r--wiki/src/install/expert/usb.zh.po2
-rw-r--r--wiki/src/install/expert/usb.zh_TW.po4
-rw-r--r--wiki/src/local.css10
-rw-r--r--wiki/src/support/chat.ar.po2
-rw-r--r--wiki/src/support/chat.ca.po2
-rw-r--r--wiki/src/support/chat.de.po4
-rw-r--r--wiki/src/support/chat.es.po4
-rw-r--r--wiki/src/support/chat.fa.po2
-rw-r--r--wiki/src/support/chat.fr.po4
-rw-r--r--wiki/src/support/chat.id.po2
-rw-r--r--wiki/src/support/chat.it.po4
-rw-r--r--wiki/src/support/chat.mdwn2
-rw-r--r--wiki/src/support/chat.pl.po2
-rw-r--r--wiki/src/support/chat.pt.po2
-rw-r--r--wiki/src/support/chat.ru.po2
-rw-r--r--wiki/src/support/chat.sr_Latn.po2
-rw-r--r--wiki/src/support/chat.tr.po2
-rw-r--r--wiki/src/support/chat.zh.po2
-rw-r--r--wiki/src/support/chat.zh_TW.po4
-rw-r--r--wiki/src/upgrade/v2/Tails/4.12/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v2/Tails/4.12/amd64/alpha/upgrades.yml.pgp16
37 files changed, 72 insertions, 65 deletions
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 60a6145..9cae5c6 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1110,7 +1110,7 @@ GnuPG tools (namely: GPG itself and Seahorse) are configured to use
<https://keys.opengpg.org> via its Onion service, since it's reliable.
GnuPG is configured accordingly to the [OpenPGP Best
-Practices](https://help.riseup.net/en/security/message-security/openpgp/best-practices),
+Practices](https://riseup.net/en/security/message-security/openpgp/best-practices),
e.g. to prefer non-outdated digest algorithms from the
SHA-2 family, to force exclusion of the version string in ASCII armored
output, to avoid automatically locating and retrieving keys, and to
diff --git a/wiki/src/doc/anonymous_internet/thunderbird.mdwn b/wiki/src/doc/anonymous_internet/thunderbird.mdwn
index 6bb05db..c68e76e 100644
--- a/wiki/src/doc/anonymous_internet/thunderbird.mdwn
+++ b/wiki/src/doc/anonymous_internet/thunderbird.mdwn
@@ -56,6 +56,26 @@ help](https://support.mozilla.org/en-US/products/thunderbird).
If the automatic configuration fails, consult your email provider
about how to configure your email account manually.
+ <div class="tip">
+
+ <h2>Configuring a Gmail account</h2>
+
+ <p>If you are using Gmail, you need to first configure your account to
+ allow access from other email clients, such as
+ <span class="application">Thunderbird</span>.</p>
+
+ <p>To configure your Gmail account to allow access from
+ <span class="application">Thunderbird</span>, you need to:</p>
+
+ <ol>
+ <li>Enable IMAP or POP. See <a href="https://support.google.com/mail/answer/7126229">Gmail Help: Check Gmail through other email platforms</a>.</li>
+ <li>Turn on 2-Step Verification. See <a href="https://support.google.com/accounts/answer/185839">Google Account Help: 2-Step Verification</a>.</li>
+ <li>Create an App Password. See <a href="https://support.google.com/mail/answer/185833">Gmail Help: Sign in with App Passwords</a>.</li>
+ <li>Use the App Password in <em>Thunderbird</em>.</li>
+ </ol>
+
+ </div>
+
1. If the automatic configuration succeeds, you might have to specify
which protocol to use to connect to your email provider, either
<span class="guilabel">IMAP</span> or <span class="guilabel">POP</span>.
diff --git a/wiki/src/install/expert/usb.ar.po b/wiki/src/install/expert/usb.ar.po
index 015d66d..31549be 100644
--- a/wiki/src/install/expert/usb.ar.po
+++ b/wiki/src/install/expert/usb.ar.po
@@ -94,7 +94,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.ca.po b/wiki/src/install/expert/usb.ca.po
index 978bd55..e8a7fc6 100644
--- a/wiki/src/install/expert/usb.ca.po
+++ b/wiki/src/install/expert/usb.ca.po
@@ -92,7 +92,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.de.po b/wiki/src/install/expert/usb.de.po
index 4e1bae3..9fe7765 100644
--- a/wiki/src/install/expert/usb.de.po
+++ b/wiki/src/install/expert/usb.de.po
@@ -101,11 +101,11 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
"<p>Um zu lernen, wie Sie sich einen OpenPGP-Schlüssel erstellen, sehen Sie auf \n"
-"<a href=\"https://help.riseup.net/de/security/message-security/openpgp/gpg-keys\">OpenPGP-Schlüssel\n"
+"<a href=\"https://riseup.net/de/security/message-security/openpgp/gpg-keys\">OpenPGP-Schlüssel\n"
"verwalten</a> von <em>Riseup</em> nach.</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.es.po b/wiki/src/install/expert/usb.es.po
index 3e3e56d..14a3aed 100644
--- a/wiki/src/install/expert/usb.es.po
+++ b/wiki/src/install/expert/usb.es.po
@@ -100,11 +100,11 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
"<p>Para aprender como crear tu propia llave OpenPGP, lee\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> por <em>Riseup</em>.</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.fa.po b/wiki/src/install/expert/usb.fa.po
index e74d5b5..23e959b 100644
--- a/wiki/src/install/expert/usb.fa.po
+++ b/wiki/src/install/expert/usb.fa.po
@@ -92,7 +92,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.fr.po b/wiki/src/install/expert/usb.fr.po
index 14b0f3f..8211e00 100644
--- a/wiki/src/install/expert/usb.fr.po
+++ b/wiki/src/install/expert/usb.fr.po
@@ -98,11 +98,11 @@ msgstr "<p>Pour suivre ces instructions, vous aurez besoin d'une clé OpenPGP.</
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
"<p>Pour apprendre à créer une clé OpenPGP, voir\n"
-"<a href=\"https://help.riseup.net/fr/security/message-security/openpgp/gpg-keys\">Gestion\n"
+"<a href=\"https://riseup.net/fr/security/message-security/openpgp/gpg-keys\">Gestion\n"
"des clés OpenPGP</a> par <em>Riseup</em>.</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.id.po b/wiki/src/install/expert/usb.id.po
index 51f7686..db60311 100644
--- a/wiki/src/install/expert/usb.id.po
+++ b/wiki/src/install/expert/usb.id.po
@@ -92,7 +92,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.it.po b/wiki/src/install/expert/usb.it.po
index d0d5373..05e719d 100644
--- a/wiki/src/install/expert/usb.it.po
+++ b/wiki/src/install/expert/usb.it.po
@@ -98,11 +98,11 @@ msgstr "<p>Per seguire queste istruzioni devi avere una tua chiave OpenPGP.</p>\
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
"<p>Per imparare come creare tu stessa una chiave OpenPGP, vedi\n"
-"<a href=\"https://help.riseup.net/it/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/it/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> di <em>Riseup</em>.</p>\n"
#. type: Plain text
diff --git a/wiki/src/install/expert/usb.mdwn b/wiki/src/install/expert/usb.mdwn
index 80a6829..f9bc995 100644
--- a/wiki/src/install/expert/usb.mdwn
+++ b/wiki/src/install/expert/usb.mdwn
@@ -27,7 +27,7 @@ the Tails USB image.
key.</p>
<p>To learn how to create yourself an OpenPGP key, see
-<a href="https://help.riseup.net/en/security/message-security/openpgp/gpg-keys">Managing
+<a href="https://riseup.net/en/security/message-security/openpgp/gpg-keys">Managing
OpenPGP Keys</a> by <em>Riseup</em>.</p>
</div>
diff --git a/wiki/src/install/expert/usb.pl.po b/wiki/src/install/expert/usb.pl.po
index 49c6087..f565cd9 100644
--- a/wiki/src/install/expert/usb.pl.po
+++ b/wiki/src/install/expert/usb.pl.po
@@ -93,7 +93,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.pt.po b/wiki/src/install/expert/usb.pt.po
index a48c279..c80c2f7 100644
--- a/wiki/src/install/expert/usb.pt.po
+++ b/wiki/src/install/expert/usb.pt.po
@@ -95,7 +95,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.ru.po b/wiki/src/install/expert/usb.ru.po
index 3869292..470aa99 100644
--- a/wiki/src/install/expert/usb.ru.po
+++ b/wiki/src/install/expert/usb.ru.po
@@ -93,7 +93,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.sr_Latn.po b/wiki/src/install/expert/usb.sr_Latn.po
index b6d4e05..0c64ec2 100644
--- a/wiki/src/install/expert/usb.sr_Latn.po
+++ b/wiki/src/install/expert/usb.sr_Latn.po
@@ -93,7 +93,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.tr.po b/wiki/src/install/expert/usb.tr.po
index e99008b..211eb8b 100644
--- a/wiki/src/install/expert/usb.tr.po
+++ b/wiki/src/install/expert/usb.tr.po
@@ -92,7 +92,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.zh.po b/wiki/src/install/expert/usb.zh.po
index 589eb85..316b496 100644
--- a/wiki/src/install/expert/usb.zh.po
+++ b/wiki/src/install/expert/usb.zh.po
@@ -92,7 +92,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
diff --git a/wiki/src/install/expert/usb.zh_TW.po b/wiki/src/install/expert/usb.zh_TW.po
index de7de38..d5baa3a 100644
--- a/wiki/src/install/expert/usb.zh_TW.po
+++ b/wiki/src/install/expert/usb.zh_TW.po
@@ -99,11 +99,11 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
-"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
+"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
"<p>要了解如何建立自己的 OpenPGP-密鑰,請見 \n"
-"<a href=\"https://help.riseup.net/de/security/message-security/openpgp/gpg-keys\">管理\n"
+"<a href=\"https://riseup.net/de/security/message-security/openpgp/gpg-keys\">管理\n"
"OpenPGP 密鑰</a> (英文) 版 <em>Riseup</em></p>\n"
#. type: Plain text
diff --git a/wiki/src/local.css b/wiki/src/local.css
index 332e87f..9328a48 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local.css
@@ -1009,7 +1009,7 @@ div.bug, div.caution, div.next, div.note, div.tip, div.trophy {
background-color: #FFFFF0;
border: 1px solid #E0E0DF;
border-radius: 4px;
- padding: 1.35em 6px 0em;
+ padding: 1.5em 6px 0em;
background-position: 6px 0.5em;
background-repeat: no-repeat;
min-height: 48px;
@@ -1040,6 +1040,14 @@ div.bug pre, div.caution pre, div.next pre, div.note pre, div.tip pre, div.troph
max-width: 30em;
}
+div.bug *:first-child, div.caution *:first-child, div.next *:first-child, div.note *:first-child, div.tip *:first-child, div.trophy *:first-child {
+ margin-top: 0;
+}
+
+div.bug *:last-child, div.caution *:last-child, div.next *:last-child, div.note *:last-child, div.tip *:last-child, div.trophy *:last-child {
+ margin-bottom: 1.5em;
+}
+
/* Code, preformatted text, and command lines */
code {
diff --git a/wiki/src/support/chat.ar.po b/wiki/src/support/chat.ar.po
index 999a57e..b324fb7 100644
--- a/wiki/src/support/chat.ar.po
+++ b/wiki/src/support/chat.ar.po
@@ -28,7 +28,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/chat.ca.po b/wiki/src/support/chat.ca.po
index c0c5c12..49f6198 100644
--- a/wiki/src/support/chat.ca.po
+++ b/wiki/src/support/chat.ca.po
@@ -28,7 +28,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/chat.de.po b/wiki/src/support/chat.de.po
index 36cfb0a..6bc011d 100644
--- a/wiki/src/support/chat.de.po
+++ b/wiki/src/support/chat.de.po
@@ -28,10 +28,10 @@ msgstr "Kommen Sie in unseren XMPP-Chatroom, um Fragen zu Tails zu stellen."
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
"Um dies zu tun, brauchen Sie einen XMPP-Konto. Einige E-Mail-Provider wie "
-"[Riseup](https://help.riseup.net/en/chat) bieten auch XMPP-Konten an."
+"[Riseup](https://riseup.net/en/chat) bieten auch XMPP-Konten an."
#. type: Plain text
msgid ""
diff --git a/wiki/src/support/chat.es.po b/wiki/src/support/chat.es.po
index 276e271..b330e7c 100644
--- a/wiki/src/support/chat.es.po
+++ b/wiki/src/support/chat.es.po
@@ -30,10 +30,10 @@ msgstr "Únete a nuestro chat XMPP para preguntar sobre Tails."
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
"Para hacerlo, necesitas una cuenta XMPP. Algunos proveedores de email, como "
-"[Riseup](https://help.riseup.net/en/chat), dan cuentas de XMPP también."
+"[Riseup](https://riseup.net/en/chat), dan cuentas de XMPP también."
#. type: Plain text
msgid ""
diff --git a/wiki/src/support/chat.fa.po b/wiki/src/support/chat.fa.po
index 46c96b9..caeba15 100644
--- a/wiki/src/support/chat.fa.po
+++ b/wiki/src/support/chat.fa.po
@@ -31,7 +31,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/chat.fr.po b/wiki/src/support/chat.fr.po
index 0fd61d5..5f308b4 100644
--- a/wiki/src/support/chat.fr.po
+++ b/wiki/src/support/chat.fr.po
@@ -28,10 +28,10 @@ msgstr "Rejoignez notre salon XMPP pour poser des questions à propos de Tails."
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
"Vous aurez besoin d'un compte XMPP. Certains fournisseurs de mails, comme "
-"[Riseup](https://help.riseup.net/fr/chat), fournissent aussi des comptes "
+"[Riseup](https://riseup.net/fr/chat), fournissent aussi des comptes "
"XMPP."
#. type: Plain text
diff --git a/wiki/src/support/chat.id.po b/wiki/src/support/chat.id.po
index 3aef90d..216a00d 100644
--- a/wiki/src/support/chat.id.po
+++ b/wiki/src/support/chat.id.po
@@ -28,7 +28,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/chat.it.po b/wiki/src/support/chat.it.po
index 86e762b..f950e55 100644
--- a/wiki/src/support/chat.it.po
+++ b/wiki/src/support/chat.it.po
@@ -29,10 +29,10 @@ msgstr "Unisciti nella nostra chat XMPP per porre domande riguardo Tails."
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
"Per far ciò, è necessario avere un account XMPP. Alcuni provider di posta "
-"elettronica, come ad esempio [Riseup](https://help.riseup.net/en/chat), "
+"elettronica, come ad esempio [Riseup](https://riseup.net/en/chat), "
"forniscono anche account XMPP."
#. type: Plain text
diff --git a/wiki/src/support/chat.mdwn b/wiki/src/support/chat.mdwn
index 7c7a624..d9fa4de 100644
--- a/wiki/src/support/chat.mdwn
+++ b/wiki/src/support/chat.mdwn
@@ -3,7 +3,7 @@
Join our XMPP chat room to ask questions about Tails.
To do so, you need an XMPP account. Some email providers, such as
-[Riseup](https://help.riseup.net/en/chat), provide XMPP accounts as well.
+[Riseup](https://riseup.net/en/chat), provide XMPP accounts as well.
Then configure your preferred instant messaging client, for example
[[Pidgin|http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and
diff --git a/wiki/src/support/chat.pl.po b/wiki/src/support/chat.pl.po
index 72b1978..c946340 100644
--- a/wiki/src/support/chat.pl.po
+++ b/wiki/src/support/chat.pl.po
@@ -28,7 +28,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/chat.pt.po b/wiki/src/support/chat.pt.po
index 57c89df..a427200 100644
--- a/wiki/src/support/chat.pt.po
+++ b/wiki/src/support/chat.pt.po
@@ -27,7 +27,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/chat.ru.po b/wiki/src/support/chat.ru.po
index a6c6fe3..1002488 100644
--- a/wiki/src/support/chat.ru.po
+++ b/wiki/src/support/chat.ru.po
@@ -28,7 +28,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/chat.sr_Latn.po b/wiki/src/support/chat.sr_Latn.po
index 5bbaba2..0495110 100644
--- a/wiki/src/support/chat.sr_Latn.po
+++ b/wiki/src/support/chat.sr_Latn.po
@@ -28,7 +28,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as "
-"[Riseup](https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"[Riseup](https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/chat.tr.po b/wiki/src/support/chat.tr.po
index 72b1978..c946340 100644
--- a/wiki/src/support/chat.tr.po
+++ b/wiki/src/support/chat.tr.po
@@ -28,7 +28,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/chat.zh.po b/wiki/src/support/chat.zh.po
index 72b1978..c946340 100644
--- a/wiki/src/support/chat.zh.po
+++ b/wiki/src/support/chat.zh.po
@@ -28,7 +28,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as [Riseup]"
-"(https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"(https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/chat.zh_TW.po b/wiki/src/support/chat.zh_TW.po
index 5d8462e..6ec5026 100644
--- a/wiki/src/support/chat.zh_TW.po
+++ b/wiki/src/support/chat.zh_TW.po
@@ -30,9 +30,9 @@ msgstr "加入我們的 XMPP 聊天室來詢問有關 Tails 的問題。"
#. type: Plain text
msgid ""
"To do so, you need an XMPP account. Some email providers, such as "
-"[Riseup](https://help.riseup.net/en/chat), provide XMPP accounts as well."
+"[Riseup](https://riseup.net/en/chat), provide XMPP accounts as well."
msgstr ""
-"你需要一個 XMPP-帳號,有些 E-Mail-供應者,如[Riseup](https://help.riseup.net/en/chat) 即提供 "
+"你需要一個 XMPP-帳號,有些 E-Mail-供應者,如[Riseup](https://riseup.net/en/chat) 即提供 "
"XMPP-帳號服務。"
#. type: Plain text
diff --git a/wiki/src/upgrade/v2/Tails/4.12/amd64/alpha/upgrades.yml b/wiki/src/upgrade/v2/Tails/4.12/amd64/alpha/upgrades.yml
deleted file mode 100644
index f965a98..0000000
--- a/wiki/src/upgrade/v2/Tails/4.12/amd64/alpha/upgrades.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-build-target: amd64
-channel: alpha
-initial-install-version: '4.12'
-product-name: Tails
diff --git a/wiki/src/upgrade/v2/Tails/4.12/amd64/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v2/Tails/4.12/amd64/alpha/upgrades.yml.pgp
deleted file mode 100644
index 4e6f9bd..0000000
--- a/wiki/src/upgrade/v2/Tails/4.12/amd64/alpha/upgrades.yml.pgp
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEBUafuF6tZYm0PUHT0h2tOK8oHAsFAl9EumIACgkQ0h2tOK8o
-HAulohAAyHPkK1sJpe+RSFveeAXCWNpWrHT3T4PcpB4ZX63QWutvCI29S00ChBFw
-uUJ+fnodSvOd3+vsvtnRiOntTJwed91XwsJgjQrBzTwDSSaVpMVbpkDrFuXUl1vX
-YFhRNi/JgqCYBoLWpo/dtxEDnKDM4KWwY67Wb/9kMFv3rBR3sZvRWsVWtUqbNoZD
-raKalwRwB8ya2WXWWmbNoAyTmCf9ZV/KQwYfFmASQ1vdkO/2SC2FeY4hksAMQMx7
-Kh1r9B1DGkCaISgvpnOFEzcudQCFaTxNwBCczy2d4hEDOpYZ0VZ6upWFdpJr5doq
-yzHXY29jQfufqffe9GYkeOlnyWx4o/xIp19iHXUupUfyP6MQN4PRtaYeWDawDQ7p
-IKbA89MLhiwuRcrx9J+Epkgi+PTraElzYi/390V9IS1E4/GDfvxbWpBtLcUnIyUQ
-SlWuwd9wd3faMS8MwsHZB4wbshfwbvaIwCPKdawhUfMFegmL63IWFEq1gaUSfJ6s
-/+y2HxhEmfNK0asg5JDeJledebRBNlKc+CNhDcDVH1fT89WzmXpb5k8wEXXni1LU
-ftsZ2lTPUd70iiBqgs6Knwqk3DYC3Io/azTsh4Tx0UzIhUnEugubyjsIq7ajMyUw
-IHoh4yH3iT2coFDuZBkstUSOHC8zD8G9CCOSXs5Un1i8GzR0jYY=
-=ZXP7
------END PGP SIGNATURE-----