[tor-commits] r25212: {website} attempt to clarify the distributing tor faq, now that someon (website/trunk/docs/en)

[Andrew Lewman]

Author: phobos
Date: 2011-11-14 21:09:18 +0000 (Mon, 14 Nov 2011)
New Revision: 25212

Modified:
   website/trunk/docs/en/faq.wml
Log:
attempt to clarify the distributing tor faq, now that someone called and was very confused.


Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2011-11-14 21:08:48 UTC (rev 25211)
+++ website/trunk/docs/en/faq.wml	2011-11-14 21:09:18 UTC (rev 25212)
@@ -318,7 +318,7 @@
     <hr>
 
     <a id="DistributingTor"></a>
-    <h3><a class="anchor" href="#DistributingTor">Can I distribute Tor on my magazine's CD?</a></h3>
+    <h3><a class="anchor" href="#DistributingTor">Can I distribute Tor?</a></h3>
 
     <p>
     Yes.
@@ -340,18 +340,20 @@
 
     <p>
     Most people who ask us this question don't want to distribute just the
-    Tor software, though. They want to distribute the Tor bundles, which
-    typically include <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>
-    and <a href="<page projects/vidalia>">Vidalia</a>.
+    Tor software, though. They want to distribute the <a
+    href="https://www.torproject.org/projects/torbrowser.html.en">Tor
+    Browser</a>. This includes <a
+    href="https://www.mozilla.org/en-US/firefox/all-aurora.html">Mozilla
+    Aurora</a> and <a href="<page projects/vidalia>">Vidalia</a>.
     You will need to follow the licenses for those programs
     as well. Both of them are distributed under the <a
     href="https://www.fsf.org/licensing/licenses/gpl.html">GNU General
-    Public License</a>. The simplest way to obey their licenses is to
-    include the source code for these programs everywhere you include
-    the bundles themselves. Look for "source" packages on the <a
-    href="<page projects/vidalia>">Vidalia page</a> and the <a
-    href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo
-    download page</a>.
+    Public License</a>. The simplest way to obey their licenses is
+    to include the source code for these programs everywhere you
+    include the bundles themselves. Look for "source" packages on
+    the <a href="<page projects/vidalia>">Vidalia page</a> and <a
+    href="https://www.mozilla.org/en-US/firefox/all-aurora.html">Mozilla
+    Aurora</a> pages.
     </p>
 
     <p>