commit 3c66c6325d5dab2e664a6040c5a13614bfb97d18 Author: Runa A. Sandvik runa.sandvik@gmail.com Date: Sun Nov 6 16:53:59 2011 +0000
Clean up the FAQ and keep things simple --- html/index.html | 87 ++++++++++++++++++++---------------------------------- 1 files changed, 32 insertions(+), 55 deletions(-)
diff --git a/html/index.html b/html/index.html index a924c0a..660d0c1 100644 --- a/html/index.html +++ b/html/index.html @@ -38,7 +38,6 @@ <li><a id="t1" href="#what_is_it">What Is It?</a></li> <li><a id="t2" href="#get_started">Get Started!</a></li> <li><a id="t3" href="#faq">FAQ</a></li> - <li><a id="t4" href="#support">Support</a></li> </ul> </nav> <h1 id="logo"><a href="/">Tor Cloud</a></h1> @@ -92,13 +91,15 @@ <div class="deco first"></div> <h2>Sign up for an AWS account</h2> </hgroup> - <p>Before you can set up a bridge in the Amazon cloud,<br> - you need to sign up for an <i>Amazon Web Services (AWS)</i> account. + <p>Before you can set up a bridge, you need to sign up for + an <i>Amazon <br> Web Services (AWS)</i> account. <a class="signup" href="https://aws-portal.amazon.com/gp/aws/developer/registration" target="_blank" border="0"> Sign Up Now!</a> - <br><br><br>Amazon will send - you an email once your account has been activated.</p> + <br><br><br> + Amazon will send you an email once your account has + been activated. + </p> <hgroup> <div class="deco"></div> <h2>Select type of relay and its location</h2> @@ -108,8 +109,7 @@ a number of factors, including the region you decide to put it in. See <a href="http://aws.amazon.com/ec2/pricing/">Amazon EC2 Pricing</a> for more information.</p> - - <p><b>Bridge:</b></p> + <br> <ul class="region-nav"> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-11af6d78" target="_blank">us-east-1<br>Virginia</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-4bf9a40e" target="_blank">us-west-1<br>N. California</a></li> @@ -157,74 +157,51 @@ <h2>Frequently Asked Questions (FAQ)</h2> </hgroup>
- <p> - <a href="#HowMuchDoesItCost">1. How much does it cost?</a><br> - <a href="#ICantConnect">2. I can't connect as user <i>root</i>, what's wrong?</a><br> - <a href="#WhatIsInTheConfig">3. What's in the Tor configuration file?</a><br> - <a href="#AutomaticUpdates">4. Will the images automatically download and install package updates?</a><br> - <a href="#NewImages">5. Will you let me know when you publish new images?</a><br> - <a href="#ReportBugs">6. Where do I report a bug I am encountering?</a><br> - <a href="#IRC">7. Is there an IRC channel about Tor Cloud?</a><br> - <a href="#AnotherQuestion">8. I have a question that is not answered here, what do I do?</a> - </p> - - <p><b><a class="anchor" href="#HowMuchDoesItCost">1. How much does it cost?</a></b><br> - There is no fee charged by the Tor Project for you to run a Tor Cloud - image. Amazon does, however, charge instances according to their <a - href="http://aws.amazon.com/ec2/pricing/%22%3Epricing</a>. - We have <a - href="https://trac.torproject.org/projects/tor/ticket/3574#comment:4%22%3Eestimate...</a> - that running a bridge will cost around $30 a month. A private bridge - ay be cheaper, a non-exit relay will probably cost a bit - more.<br><br>If you decide to run a private bridge or a non-exit relay, please - let us know how much you end up paying each month so that we can update this - FAQ.</p> - - <p><b><a class="anchor" href="#ICantConnect">2. I can't connect as user <i>root</i>, what's wrong?</a></b><br> + <p><b>1. How much does it cost?</b><br> + There is no fee charged by the Tor Project, Inc for you to run a + Tor Cloud image. Amazon does, however, charge instances + according to their <a href="http://aws.amazon.com/ec2/pricing/">pricing</a>. + We have <a href="https://trac.torproject.org/projects/tor/ticket/3574#comment:4">estimated</a> + that running a bridge will cost around $30 a month.</p> + + <p><b>2. I can't connect as user <i>root</i>, what's wrong?</b><br> When you right-click and choose <i>connect</i>, AWS will suggest that you use <i>root</i> as the username. This is wrong. You need to use <i>ubuntu</i> as the username if you wish to connect to your server via SSH.</p>
- <p><b><a class="anchor" href="#WhatIsInTheConfig">3. What's in the Tor configuration file?</a></b><br> + <p><b>3. What's in the Tor configuration file?</b><br> Answer here.</p> - <p><b><a class="anchor" href="#AutomaticUpdates">4. Will the images automatically download and install package updates?</a></b><br> + <p><b>4. Will the images automatically download and install package updates?</b><br> Yes, the images have all been configured with the <a href="https://help.ubuntu.com/community/AutomaticSecurityUpdates"><i>unattended-upgrades</i></a> package. This means that your system will automatically download and install updates.</p>
- <p><b><a class="anchor" href="#NewImages">5. Will you let me know when you publish new images?</a></b><br> + <p><b>5. Will you let me know when you publish new images?</b><br> New cloud images will be announced on <a href="https://twitter.com/torproject">Twitter</a>, <a href="https://identi.ca/torproject">identi.ca</a>, <a href="https://blog.torproject.org">our blog</a> and on the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a> mailing list.</p>
- <p><b><a class="anchor" href="#ReportBugs">6. Where do I report a bug I am encountering?</a></b><br> - If you think the bug you have found is specific to the Tor Cloud images we provide, please <a href="https://trac.torproject.org">file a bug</a> or send an email to <i>community-support AT lists.torproject.org</i>.</p> + <p><b>6. Where do I report a bug I am encountering?</b><br> + If you think the bug you have found is specific to the Tor Cloud + images we provide, please <a + href="https://trac.torproject.org%22%3Efile a bug</a> or + send an email to <i>help AT rt.torproject.org</i>.</p>
- <p><b><a class="anchor" href="#IRC">7. Is there an IRC channel about Tor Cloud?</a></b><br> + <p><b>7. Is there an IRC channel where I can ask about Tor Cloud?</b><br> Yes, simply join #tor on irc.oftc.net and ask your question. It may take a while before we get back to you, so please be patient.</p>
- <p><b><a class="anchor" href="#AnotherQuestion">8. I have a question that is not answered here, what do I do?</a></b><br> - Please send an email to <i>community-support AT lists.torproject.org</i> and we'll make sure it gets added to the list.</p> + <p><b>8. I have a question that is not answered here, what do I do?</b><br> + Please send an email to <i>help AT rt.torproject.org</i> and we'll make sure it gets added to the list.</p> </div>
-<!-- Support --> - <div class="main" role="main"> - <hgroup> - <div class="deco first"></div> - <h2>Questions/Comments</h2> - </hgroup> - <p class="support"><a - href="mailto:community-support@lists.torproject.org">community-support@lists.torproject.org</a></p> - </div> - </div> <footer> <div id="hbody"> - <p>Tor Cloud is developed and maintained by partnership - between <a href="http://expressiontech.org">ExpressionTech</a> - and <a href="https://www.torproject.org">The Tor Project</a>, - powered by:<br /> The Tor Project: "Tor" and the "Onion Logo" - are registered trademarks of The Tor Project, Inc.<br /> - Ubuntu:Ubuntu is a registered trademark of Canonical Ltd.</p> + <p>The Tor Cloud project is developed and maintained by + partnership between <a + href="http://expressiontech.org%22%3EExpressionTech</a> + and <a href="https://www.torproject.org">The Tor Project</a>.<br /> + "Tor" and the "Onion Logo" are registered trademarks of The Tor Project, Inc.<br /> + Ubuntu is a registered trademark of Canonical Ltd.</p>
<p>Content on this site is licensed under a Creative Commons Attribution 3.0 United States License, unless otherwise