summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc/about/features.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/src/doc/about/features.mdwn')
-rw-r--r--wiki/src/doc/about/features.mdwn8
1 files changed, 5 insertions, 3 deletions
diff --git a/wiki/src/doc/about/features.mdwn b/wiki/src/doc/about/features.mdwn
index 1f8ba78..6e2f601 100644
--- a/wiki/src/doc/about/features.mdwn
+++ b/wiki/src/doc/about/features.mdwn
@@ -17,8 +17,8 @@ Networking
- the [Vidalia](https://www.torproject.org/projects/vidalia) graphical frontend
* [NetworkManager](http://projects.gnome.org/NetworkManager/) for easy
network configuration
-* [Firefox](http://getfirefox.com) preconfigured with:
- - TorBrowser patches
+* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en), a web
+ browser based on [Mozilla Firefox](http://getfirefox.com) and modified to protect your anonymity with:
- [Torbutton](https://www.torproject.org/torbutton) for anonymity
and protection against evil JavaScript
- all cookies are treated as session cookies by default;
@@ -58,7 +58,8 @@ Desktop Edition
Encryption and privacy
----------------------
-* [LUKS](http://en.wikipedia.org/wiki/LUKS) and [[!wikipedia Palimpsest]] to
+* [[!wikipedia Linux_Unified_Key_Setup desc="LUKS"]] and [[!wikipedia
+ GNOME_Disks]] to
install and use encrypted storage devices, for example USB sticks
* [GnuPG](http://gnupg.org/), the GNU implementation of OpenPGP for email and
data encyption and signing
@@ -93,6 +94,7 @@ Additional features
Incognito Live System in about one hour on a modern desktop computer
* 64-bit PAE-enabled kernel with NX-bit and SMP support on hardware that supports it
* Some basic [[doc/first_steps/accessibility]] features
+* Some [[contribute/design/application_isolation]] with AppArmor
To prevent cold-boot attacks and various memory forensics, Tails
erases memory on shutdown and when the boot media is physically