tor-webwml.git

@@ -75,8 +75,8 @@ href="http://paypal.com/">PayPal</a> account):<br />

 <input type="hidden" name="cmd" value="_xclick-subscriptions" />

 <input type="hidden" name="business" value="donations@torproject.org" />

 <input type="hidden" name="item_name" value="Tor Project Membership" />

-<input type="hidden" name="return" value="https://torproject.org/">

-<input type="hidden" name="cancel_return" value="https://torproject.org/donate">

+<input type="hidden" name="return" value="https://www.torproject.org/">

+<input type="hidden" name="cancel_return" value="https://www.torproject.org/donate">

 </p>

 </form>

@@ -93,8 +93,8 @@ href="http://paypal.com/">PayPal</a> account):<br />

 <input type="hidden" name="cmd" value="_xclick" />

 <input type="hidden" name="business" value="donations@torproject.org" />

 <input type="hidden" name="item_name" value="Tor" />

-<input type="hidden" name="return" value="https://torproject.org/">

-<input type="hidden" name="cancel_return" value="https://torproject.org/donate">

+<input type="hidden" name="return" value="https://www.torproject.org/">

+<input type="hidden" name="cancel_return" value="https://www.torproject.org/donate">

 </p>

 </form>

@@ -104,7 +104,7 @@ href="http://paypal.com/">PayPal</a> account):<br />

 way to donate (such as a European-style bank transfer), <a

 href="mailto:donations@torproject.org">let us know</a> and we'll work

 something out. Donations of $65 or more qualify you for a <a

-href="https://torproject.org/tshirt.html">bright green Tor t-shirt</a>.

+href="https://www.torproject.org/tshirt.html">bright green Tor t-shirt</a>.

 </p>

 <p>Help us keep Tor under <a

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

 <hr />

 <p>

-The canonical URL of this site is <a href="https://torproject.org/">https://torproject.org</a>,

+The canonical URL of this site is <a href="https://www.torproject.org/">https://www.torproject.org</a>,

 but there are a few mirrors of it in other places.

 </p>

@@ -44,7 +44,7 @@ fundraising, PR, and community relations.</dd>

 runs one of the directory authorities, runs the wiki, and generally

 helps out a lot.</dd>

 <dt>Mike Perry</dt><dd>Author of <a

-href="https://torproject.org/svn/torflow/README">TorFlow</a>, a Tor

+href="https://www.torproject.org/svn/torflow/README">TorFlow</a>, a Tor

 controller that builds paths through the Tor network and

 measures various properties and behaviors. Working now on a <a

 href="https://torbutton.torproject.org/dev/">much more comprehensive

@@ -83,7 +83,7 @@ Coders:</a></h3>

 <dl>

 <dt>Benedikt Boss</dt><dd>Worked on <a

-href="https://torproject.org/svn/topf/README">TOPF</a>, a fuzzer for Tor;

+href="https://www.torproject.org/svn/topf/README">TOPF</a>, a fuzzer for Tor;

 mentored by Roger.</dd>

 <dt>Christian King</dt><dd> Worked on making Tor servers stable on

 Windows; mentored by Nick.</dd>

@@ -99,23 +99,23 @@ properties of the Tor network; mentored by Mike Perry.</dd>

 <dl>

 <dt>Bogdan Drozdowski</dt><dd><a

-href="https://torproject.org/index.html.pl">Polish</a>.</dd>

+href="https://www.torproject.org/index.html.pl">Polish</a>.</dd>

 <dt>fredzupy</dt><dd><a

-href="https://torproject.org/index.html.fr">French</a>.</dd>

+href="https://www.torproject.org/index.html.fr">French</a>.</dd>

 <dt>Ruben Garcia</dt><dd><a

-href="https://torproject.org/index.html.es">Spanish</a>.</dd>

+href="https://www.torproject.org/index.html.es">Spanish</a>.</dd>

 <dt>Jens Kubieziel</dt><dd><a

-href="https://torproject.org/index.html.de">German</a>.</dd>

+href="https://www.torproject.org/index.html.de">German</a>.</dd>

 <dt>Pei Hanru</dt><dd><a

-href="https://torproject.org/index.html.zh-cn">Simplified Chinese</a>.</dd>

+href="https://www.torproject.org/index.html.zh-cn">Simplified Chinese</a>.</dd>

 <dt>Jan Reister</dt><dd><a

-href="https://torproject.org/index.html.it">Italian</a>.</dd>

+href="https://www.torproject.org/index.html.it">Italian</a>.</dd>

 <dt>Masaki Taniguchi</dt><dd><a

-href="https://torproject.org/index.html.ja">Japanese</a>.</dd>

+href="https://www.torproject.org/index.html.ja">Japanese</a>.</dd>

 <dt>Jan Woning</dt><dd><a

-href="https://torproject.org/index.html.nl">Dutch</a>.</dd>

+href="https://www.torproject.org/index.html.nl">Dutch</a>.</dd>

 <dt>ygrek</dt><dd><a

-href="https://torproject.org/index.html.ru">Russian</a>.</dd>

+href="https://www.torproject.org/index.html.ru">Russian</a>.</dd>

 </dl>

 <a id="Volunteers"></a>

@@ -0,0 +1,52 @@

+## translation metadata

+# Revision: $Revision$

+

+#include "head.wmi" TITLE="Tor Trademark FAQ"

+<div class="main-column">

+

+<!-- PUT CONTENT AFTER THIS TAG -->

+<h1>Tor Trademark Frequently Asked Questions</h1>

+<hr />

+

+<h2>How can I use the name “Tor”?</h2>

+<p>The Tor Project encourages developers to use the name Tor in ways that

+do not confuse the public about the source of anonymity software and

+services.  If you are building open-source non-commercial software or

+services that incorporate or work with the Tor Project's code, you may

+use the name “Tor” in an accurate description of your work.  We ask you

+to include a link to the official Tor website,

+<a href="https://www.torproject.org/">https://www.torproject.org</a> so users can verify the original source of

+Tor for themselves, and a note indicating that your project is not

+sponsored by the Tor Project. For example, “This product is produced

+independently from the Tor™ anonymity software and carries no guarantee

+from the Tor Project about quality, suitability or anything else.”</p>

+

+<h2>Can I use the Tor onion logo?</h2>

+<p>If you're making non-commercial use of Tor software, you may also use

+the Tor onion logo (as an illustration, not as a brand for your

+products).  Please don't modify the design or colors of the logo.  You

+can use items that look like the Tor onion logo to illustrate a point

+(e.g. an exploded onion with layers, for instance), so long as they're

+not used as logos in ways that would confuse people.</p>

+

+<h2>Does this mean you're enforcing trademark rights?</h2>

+<p>The Tor Project is a non-profit corporation organized to research and

+develop the Tor anonymity software and network.  We don't want to be

+trademark bullies, but we will use trademark to protect the public's

+ability to recognize Tor Project software.  Trademark helps us to assure

+that the name is used only in connection with genuine Tor anonymity

+software and for accurate description of software and services.  

+After all, to protect their anonymity securely, computer users must be

+able to identify the software they are using, so they can account

+properly for its strengths and weaknesses.  Tor has become well-known as

+a software package and associated network of onion-routing anonymizing

+proxies, with online documentation, instructions for strengthening

+anonymity protection, and warnings that even at this stage it remains

+experimental software.  We work with developers to improve the software

+and network and actively encourage researchers to document attacks to

+help us strengthen its anonymity protection further.  We distribute the

+software itself freely, but require correct attribution. </p>

+

+</div><!-- #main -->

+

+#include <foot.wmi>

@@ -46,7 +46,7 @@ sub do_status($$) {

 	print "<th>File</th>\n";

 	printf("<th>%s (%s)</th>\n", $_, $LANGUAGES{$_}) for ('en', grep { $_ ne 'en' } @LANGUAGES);

 	print "</tr>\n";

-	my $HTMLBASE = (defined $ENV{'HTMLBASE'} ? $ENV{'HTMLBASE'} : 'https://torproject.org/') . ($dir eq '.' ? '' : $dir.'/');

+	my $HTMLBASE = (defined $ENV{'HTMLBASE'} ? $ENV{'HTMLBASE'} : 'https://www.torproject.org/') . ($dir eq '.' ? '' : $dir.'/');

 	for my $file (sort {$a cmp $b} keys %{$files{'en'}}) {

 		my $obs = file_is_obsolete($dir, 'en', $file);

@@ -67,7 +67,7 @@ new versions of the pictures.</li>

 appropriate language: "Neither the Tor developers nor EFF have reviewed

 this translation for accuracy and correctness. It may be out of date

 or wrong. The official Tor web site is the English version, available

-at https://torproject.org/"</li>

+at <a href="https://www.torproject.org">https://www.torproject.org/</a>"</li>

 <li>Use valid <a href="http://roselli.org/adrian/articles/character_charts.asp">character entities</a>.

 Even though most browsers display the characters correctly these days, we want

@@ -181,10 +181,10 @@ runs stably and efficiently on Windows?</li>

 but it would be great to have a script that starts up a Tor network, uses

 it for a while, and verifies that at least parts of it are working.</li>

 <li>Help Mike Perry on his <a

-href="https://torproject.org/svn/torflow/">TorFlow</a>

-library (<a href="https://torproject.org/svn/torflow/TODO">TODO</a>):

+href="https://www.torproject.org/svn/torflow/">TorFlow</a>

+library (<a href="https://www.torproject.org/svn/torflow/TODO">TODO</a>):

 it's a python library that uses the <a

-href="https://torproject.org/svn/torctl/doc/howto.txt">Tor controller

+href="https://www.torproject.org/svn/torctl/doc/howto.txt">Tor controller

 protocol</a> to instruct Tor to build circuits in a variety of ways,

 and then it measures performance and tries to detect anomalies.</li>

 <!--

@@ -25,7 +25,7 @@

 <div class="center">

 <table class="banner" border="0" cellpadding="0" cellspacing="0">

     <tr>

-        <td class="banner-left"><a href="https://torproject.org/"><img src="$(DOCROOT)/images/top-left.png" alt="Click to go to home page" width="193" height="79"></a></td>

+        <td class="banner-left"><a href="https://www.torproject.org/"><img src="$(DOCROOT)/images/top-left.png" alt="Click to go to home page" width="193" height="79"></a></td>

         <td class="banner-middle">

 	<:{

 	    my %navigation;

@@ -1,6 +1,6 @@

 #!wml

-#<define-tag cvssandbox whitespace=delete>https://torproject.org/cvs/</define-tag>

+#<define-tag cvssandbox whitespace=delete>https://www.torproject.org/cvs/</define-tag>

 <define-tag cvssandbox whitespace=delete>cvs/</define-tag>

 <define-tag svnsandbox whitespace=delete>svn/trunk/</define-tag>

 <define-tag svnwebsite whitespace=delete>svn/website/</define-tag>