[tor-commits] [support-portal/master] Merge Alison's gettor edits

[colin@xxxxxxxxxxxxxx]

commit f4835f83e3f5eb224c713d7114e958ef2ddce24e
Author: Colin Childs <colin@xxxxxxxxxxxxxx>
Date:   Sat Apr 22 01:55:51 2017 -0500

    Merge Alison's gettor edits
---
 plain/gettor.txt | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/plain/gettor.txt b/plain/gettor.txt
index dd53405..a5b56ac 100644
--- a/plain/gettor.txt
+++ b/plain/gettor.txt
@@ -1,27 +1,12 @@
-Q. How do I get Tor if the webiste is blocked?
-A. GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.
+Q. How do I download Tor if the torproject.org is blocked?
+A. If you can't download Tor through our website [link], you can get a copy of Tor delivered to you via GetTor. GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations that are less likely to be censored, such as Dropbox, Google Drive and Github.
 
 To use GetTor via email:
 
-Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system.
-GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using.
+Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system. GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download) [link to glossary definition of cryptographic signature; instructions for verification], the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using; consult documentation about your computer to find out more.
 
 To use GetTor via Twitter:
-To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words "osx en" in it (you don't need to follow the account).
+To get links for downloading Tor Browser in English for OS X, send a direct message to @get_tor with the words "osx en" in it (you don't need to follow the account). [we need a list of all the languages offered and their codes]
 
 To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):
-To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words "linux zh" in it.
-
-Q. What is Satori?
-A. Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources.
-
-To download Tor Browser using Satori:
-1. Install Satori from the Chrome App Store.
-
-2. Select Satori from your browserâ??s Apps menu.
-
-3.When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin.
-
-4.Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??.
-
-5. Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can begin using Tor Browser. If they do not match, you may need to try downloading again, or from a different source.
+To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words "linux zh" in it. [we need a list of all the languages offered and their codes]

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits