@@ -9,7 +9,7 @@

     <a href="<page projects/projects>">Projects &raquo; </a>

     <a href="<page projects/gettor>">GetTor &raquo; </a>

   </div>

-	<div id="maincol"> 

+	<div id="maincol">

     <h1>GetTor robot</h1>

 <p>GetTor is a service that provides alternative methods to download Tor

@@ -19,12 +19,12 @@ SMTP (email).</p>

 <h2>Download Tor Browser via email</h2>

-<p>Users can communicate with GetTor robot by sending messages via email. 

+<p>Users can communicate with GetTor robot by sending messages via email.

 Currently, the best known email address to do this is gettor@torproject.org.

 This should be the most current and stable GetTor robot as it is operated

 by Tor Project itself.</p>

-<p>To ask for Tor Browser, a user should send an email to GetTor robot with 

+<p>To ask for Tor Browser, a user should send an email to GetTor robot with

 one of the following options in the body of the message:</p>

 <ul>

@@ -36,69 +36,10 @@ one of the following options in the body of the message:</p>

    </li>

 </ul>

-<p>Options are case insensitive. If a user selects two or more options, only 

-the first one will be considered. After the user sends a valid option, GetTor 

-robot will reply with links to download Tor Browser from popular cloud 

-services. For now, the only cloud service supported is Dropbox. A sample 

-reply from GetTor robot should look similar to this:</p>

-

-<pre>

-   Thank you for your request for windows-en.

-

-   Here are the download links:

-

-   ===

-   Tor Browser Bundle:

-   ===

-

-   Dropbox

-

-   Package (32/64-bit):

-   https://www.dropbox.com/s/0p4oew8w/torbrowser-install-4.0.1_en-US.exe?dl=1

-

-   ASC signature (32/64-bit):

-   https://www.dropbox.com/s/y68h/torbrowser-install-4.0.1_en-US.exe.asc?dl=1

-

-   Package SHA256 checksum (32/64-bit):

-   e41078c34785e6834657d008d0c2b0b671b793b5cbc67ebc60e8d55735504a10

-

-   Fingerprint: 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659

-

-   ===

-   Support:

-   ===

-

-   Still need help? If you have any questions, trouble connecting to Tor

-   network, or need to talk to a human, please contact our support team at:

-

-     help@rt.torproject.org

-

-   We are ready to answer your queries in English, Farsi, Chinese, Arabic,

-   French and Spanish.

-</pre>

-<br>

-

-<p>If a user sends something different from the options mentioned before, 

-GetTor robot will reply with a help message explaining how to interact with 

-it. A sample help message should look like this:</p>

-

-<pre>

-   Hello, this is the 'GetTor' robot.

-

-   Thank you for your request. I am here to help you download the latest

-   Tor Browser Bundle.

-

-   Please reply to this message with one of the options below:

-

-       windows

-       linux

-       osx

-

-   And I will send you the download instructions quickly.

-

-   Tip: Just send a blank reply to this message if you are not sure.

-</pre>

-<br>

+<p>Options are case insensitive. If a user selects two or more options, only

+the first one will be considered. After the user sends a valid option, GetTor

+robot will reply with links to download Tor Browser from popular cloud

+services. For now, the only cloud service supported is Dropbox.</p>

 <p>

 Once the files have been downloaded users should <strong>verify the

@@ -115,6 +56,12 @@ pluggable transports</a>. These guides will be provided by the GetTor

 robot in the future.

 </p>

+<p>

+If a user requests an invalid option, GetTor robot will reply with a

+help message explaining how to interact with it.

+</p>

+

+

   </div>

   <!-- END MAINCOL -->

   <div id = "sidecol">

@@ -124,4 +71,4 @@ robot in the future.

   <!-- END SIDECOL -->

 </div>

 <!-- END CONTENT -->

-#include <foot.wmi>      

+#include <foot.wmi>