Only try refreshing the keyring when necessary

[torbrowser-launcher.git] / README.md

diff --git a/README.md b/README.md
index 364dfe6e8b39eae9dfb0961b700a20a4ab61b0a4..9ca9f3aefd80e45fe368fdd0bfe61ccab54a5007 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,25 +1,25 @@
-![Tor Browser Launcher](/screenshot.png)
-
 # Tor Browser Launcher
 
-Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. You install ```torbrowser-launcher``` from your distribution's package manager and it handles everything else, including:
+Tor Browser Launcher is intended to make Tor Browser easier to install and use for GNU/Linux users. You install ```torbrowser-launcher``` from your distribution's package manager and it handles everything else:
 
-* Downloading the most recent version of TBB for you, in your language and for your architecture
-* Automatically updating (while preserving your bookmarks and preferences)
-* Verifying the TBB's [GnuPG signature](http://www.gnupg.org/gph/en/manual/x135.html)
+* Downloads and installs the most recent version of Tor Browser in your language and for your computer's architecture, or launches Tor Browser if it's already installed (Tor Browser will automatically update itself)
+* Verifies Tor Browser's [signature](https://www.torproject.org/docs/verifying-signatures.html.en) for you, to ensure the version you downloaded was cryptographically signed by Tor developers and was not tampered with
+* Adds "Tor Browser" and "Tor Browser Launcher Settings" application launcher to your desktop environment's menu
 * Includes AppArmor profiles to make a Tor Browser compromise not as bad
-* Adding a "Tor Browser" application launcher to your desktop environment's menu, and letting you set Tor Browser as your default browser
-* Optionally playing a modem sound when you open Tor Browser (because Tor is so slow)
+* Optionally plays a modem sound when you open Tor Browser (because Tor is so slow)
 
-Tor Browser Launcher is included in Ubuntu 14.10+, Debian 8+, and Fedora 20+. To install it in any other distribution, see the [build instructions](/BUILD.md).
+Tor Browser Launcher is included in Ubuntu, Debian, and Fedora. To install it in any other distribution, see the [build instructions](/BUILD.md).
 
 You might want to check out the [security design doc](/security_design.md).
 
-## Installing in Ubuntu 14.04 and earlier
+![Tor Browser Launcher screenshot](/screenshot.png)
 
-I've created a PPA where I'm maintaining torbrowser-launcher binaries. You can install in an Ubuntu-based distribution like this:
+# Installing in Ubuntu
 
-    sudo add-apt-repository ppa:micahflee/ppa
-    sudo apt-get update
-    sudo apt-get install torbrowser-launcher
+If you want to always have the latest version of the `torbrowser-launcher` package before your distribution gets it, you can use my PPA:
 
+```sh
+sudo add-apt-repository ppa:micahflee/ppa
+sudo apt-get update
+sudo apt-get install torbrowser-launcher
+```