summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/design.mdwn
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2017-12-13 14:51:12 +0000
committersajolida <sajolida@pimienta.org>2017-12-13 14:51:12 +0000
commit82226b8012cffb75c5d616c75450f66d0632ee3c (patch)
tree4af7d5c95a0f551376b3adf4c2fa21f89f902a6b /wiki/src/contribute/design.mdwn
parenta585eb6adf9255373912d26f5434280b65bcfc2e (diff)
parentee32306ada3388e88886484fa5cb6f0293279598 (diff)
Merge remote-tracking branch 'origin/master' into web/10640-assistant-design-doc
Diffstat (limited to 'wiki/src/contribute/design.mdwn')
-rw-r--r--wiki/src/contribute/design.mdwn11
1 files changed, 5 insertions, 6 deletions
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index e18d363..71f0119 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -662,7 +662,7 @@ This specification must warn about such matters.
- FireWire is known to allow read access to the system memory, at
least when such devices are allowed to use DMA (Linux: `options
ohci1394 phys_dma=0` helps mitigating that).
-- Bluetooth, IrDA and other network links might allow attacks.
+- IrDA and other network links might allow attacks.
# 3 Implementation
@@ -1119,7 +1119,7 @@ GnuPG tools (namely: GPG itself and Seahorse) are configured to use
the sks-keyservers pool since it's reliable, well-synchronized with
the other HKP keyservers pools, and reachable over `hkps://`.
-[[!tails_todo Monkeysphere]]'s `hkpms://` support will be used as soon as
+Monkeysphere's `hkpms://` support will be used as soon as
possible in place of the hierarchical X.509 certification model.
GnuPG is configured accordingly to the [OpenPGP Best
@@ -1150,10 +1150,9 @@ See [[design/installation]] for details.
Tails puts the wireless devices in a sensible state at boot time.
-At boot time, Tails unblocks Wi-Fi, WWAN and WiMAX radios, unblocks
-Bluetooth radio (so that it can be dealt another way:
-[[!tails_ticket 5451 desc="protect against external bus memory forensics"]]), and
-soft-blocks all other kinds of wireless devices (e.g. UWB, GPS, FM).
+At boot time, Tails unblocks Wi-Fi, WWAN and WiMAX radios
+and soft-blocks all other kinds of wireless devices (e.g. Bluetooth,
+UWB, GPS, FM).
- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/tails-set-wireless-devices-state.service]]
- [[!tails_gitweb config/chroot_local-includes/usr/local/lib/tails-set-wireless-devices-state]]