[tor-commits] r26772: {website} Updated the Licensing FAQ. (website/trunk/docs/en)

[Matt Pagan]

Author: mttp
Date: 2014-05-08 20:46:04 +0000 (Thu, 08 May 2014)
New Revision: 26772

Modified:
   website/trunk/docs/en/faq.wml
Log:
Updated the Licensing FAQ. 


Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2014-05-08 03:11:21 UTC (rev 26771)
+++ website/trunk/docs/en/faq.wml	2014-05-08 20:46:04 UTC (rev 26772)
@@ -541,58 +541,44 @@
     </p>
 
     <p>
-    The Tor software is <a href="https://www.fsf.org/">free
-software</a>. This
-    means we give you the rights to redistribute the Tor software,
-either
-    modified or unmodified, either for a fee or gratis. You don't have
-to
+    The Tor software is <a href="https://www.fsf.org/">free software</a>. This
+    means we give you the rights to redistribute the Tor software, either
+    modified or unmodified, either for a fee or gratis. You don't have to
     ask us for specific permission.
     </p>
 
     <p>
-    However, if you want to redistribute the Tor software you must
-follow our
+    However, if you want to redistribute the Tor software you must follow our
     <a href="<gitblob>LICENSE">LICENSE</a>.
-    Essentially this means that you need to include our LICENSE file
-along
+    Essentially this means that you need to include our LICENSE file along
     with whatever part of the Tor software you're distributing.
     </p>
 
     <p>
-    Most people who ask us this question don't want to distribute just
-the
+    Most people who ask us this question don't want to distribute just the
     Tor software, though. They want to distribute the <a
     href="<page projects/torbrowser>">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 <a
-    href="https://www.mozilla.org/en-US/firefox/all-aurora.html">Mozilla
-    Aurora</a> pages.
+    href="https://www.mozilla.org/en-US/firefox/organizations/">Firefox
+    Extended Support Release</a>, and the NoScript and HTTPS-Everywhere 
+    extensions. You will need to follow the licensefor those programs as 
+    well. Both of those Firefox extensions are distributed under 
+    the <a href="https://www.fsf.org/licensing/licenses/gpl.html">GNU General
+    Public License</a>, while Firefox ESR is released under the Mozilla Public 
+    License. The simplest way to obey their licenses is to include the source 
+    code for these programs everywhere you include the bundles themselves. 
     </p>
 
     <p>
-    Also, you should make sure not to confuse your readers about what
-Tor is,
-    who makes it, and what properties it provides (and doesn't provide).
-See
-    our <a href="<page docs/trademark-faq>">trademark FAQ</a> for
-details.
+    Also, you should make sure not to confuse your readers about what Tor is,
+    who makes it, and what properties it provides (and doesn't provide). See
+    our <a href="<page docs/trademark-faq>">trademark FAQ</a> for details.
     </p>
 
     <p>
     Lastly, you should realize that we release new versions of the
     Tor software frequently, and sometimes we make backward incompatible
-    changes. So if you distribute a particular version of the Tor
-software, it
-    may not be supported — or even work — six months later.
-This
+    changes. So if you distribute a particular version of the Tor software, it
+    may not be supported — or even work — six months later. This
     is a fact of life for all security software under heavy development.
     </p>