summaryrefslogtreecommitdiffstats
path: root/wiki/src/support/faq.mdwn
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-07-13 19:17:41 +0000
committerintrigeri <intrigeri@boum.org>2016-07-13 19:17:41 +0000
commitc86ecc88ec7218b185ce2bf4855dca9d5833f702 (patch)
treebb441aef9bda3b845fa85eb0b1330c47e53c3207 /wiki/src/support/faq.mdwn
parent98d14dd48d3c7c5b8781ea1db0d7a4a414e469bc (diff)
parentb07895f16b03383d532e38895d93d5dfad3eab59 (diff)
Merge remote-tracking branch 'origin/stable' into test/11458-browser-start-notification-is-fragilewip/test/11458-browser-start-notification-is-fragile
Diffstat (limited to 'wiki/src/support/faq.mdwn')
-rw-r--r--wiki/src/support/faq.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiki/src/support/faq.mdwn b/wiki/src/support/faq.mdwn
index 10f991a..6c99e86 100644
--- a/wiki/src/support/faq.mdwn
+++ b/wiki/src/support/faq.mdwn
@@ -576,7 +576,7 @@ The problem with using BitTorrent over Tor is double:
- It harms the network, see:
<https://blog.torproject.org/blog/why-tor-is-slow>.
-We had relatively vague [[!tails_ticket 5991 desc="plans to improve
+We had relatively vague [[!tails_ticket 9563 desc="plans to improve
on this situation"]].
<a id="youtube"></a>
@@ -698,7 +698,7 @@ is limited to the browser.
Tails used to provide a <span class="guilabel">New Identity</span>
feature, but this feature was not a good solution to
-[[separate contextual identities|about/warning#identities]], as it
+[[separate contextual identities|doc/about/warning#identities]], as it
was dangerous:
* Already existing connections could stay open.