[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r23509: {website} update path to images with IMGROOT (in website/trunk: about/en en)
Author: phobos
Date: 2010-10-09 20:27:08 +0000 (Sat, 09 Oct 2010)
New Revision: 23509
Modified:
website/trunk/about/en/torusers.wml
website/trunk/en/index.wml
Log:
update path to images with IMGROOT
Modified: website/trunk/about/en/torusers.wml
===================================================================
--- website/trunk/about/en/torusers.wml 2010-10-09 20:20:37 UTC (rev 23508)
+++ website/trunk/about/en/torusers.wml 2010-10-09 20:27:08 UTC (rev 23509)
@@ -13,33 +13,20 @@
<div id="maincol">
<h1>Inception</h1>
-
- #<!-- BEGIN SIDEBAR -->
- #<div class="sidebar-left">
- #<h3>Who uses Tor?</h3>
- #<ul>
- #<li><a href="<page about/torusers>#normalusers">Normal people use Tor</a></li>
- #<li><a href="<page about/torusers>#military">Militaries use Tor</a></li>
- #<li><a href="<page about/torusers>#journalist">Journalists and their audience use Tor</a></li>
- #<li><a href="<page about/torusers>#lawenforcement">Law enforcement officers use Tor</a></li>
- #<li><a href="<page about/torusers>#activists">Activists & Whistleblowers use Tor</a></li>
- #<li><a href="<page about/torusers>#spotlight">High & low profile people use Tor</a></li>
- #<li><a href="<page about/torusers>#executives">Business executives use Tor</a></li>
- #<li><a href="<page about/torusers>#bloggers">Bloggers use Tor</a></li>
- #<li><a href="<page about/torusers>#itprofessionals">IT Professionals use Tor</a></li>
- #</ul>
- #</div>
- #<!-- END SIDEBAR -->
-
<hr />
<p>
- Tor was originally designed, implemented, and deployed as a third-generation
- <a href="http://www.onion-router.net/";>onion routing project of the Naval Research Laboratory</a>.
- It was originally developed with the U.S. Navy in mind, for the primary purpose of protecting government communications.
- Today, it is used every day for a wide variety of purposes by the military, journalists, law enforcement officers, activists, and many others. Here are some of the specific uses we've seen or recommend.
+ Tor was originally designed, implemented, and deployed as a
+ third-generation <a href="http://www.onion-router.net/";>onion routing
+ project of the Naval Research Laboratory</a>. It was originally
+ developed with the U.S. Navy in mind, for the primary purpose of
+ protecting government communications. Today, it is used every day
+ for a wide variety of purposes by the military, journalists, law
+ enforcement officers, activists, and many others. Here are some of
+ the specific uses we've seen or recommend.
</p>
<a name="normalusers"></a>
+ <img src="$(IMGROOT)/family.jpg" alt="Normal People" />
<h2><a class="anchor" href="#normalusers">Normal people use Tor</a></h2>
<hr />
<ul>
@@ -71,6 +58,7 @@
</ul>
<a name="military"></a>
+ <img src="$(IMGROOT)/military.jpg" alt="Military and Law Enforcement" />
<h2><a class="anchor" href="#military">Militaries use Tor</a></h2>
<hr />
<ul>
@@ -98,6 +86,7 @@
</ul>
<a name="journalist"></a>
+ <img src="$(IMGROOT)/media.jpg" alt="Journalists and the Media" />
<h2><a class="anchor" href="#journalist">Journalists and their audience use Tor</a></h2>
<hr />
<ul>
@@ -149,6 +138,7 @@
</ul>
<a name="activists"></a>
+ <img src="$(IMGROOT)/activists.jpg" alt="Activists & Whistleblowers" />
<h2><a class="anchor" href="#activists">Activists & Whistleblowers use Tor</a></h2>
<hr />
<ul>
@@ -247,6 +237,7 @@
</ul>
<a name="executives"></a>
+ <img src="$(IMGROOT)/consumers.jpg" alt="Businesses" />
<h2><a class="anchor" href="#executives">Business executives use Tor</a></h2>
<hr />
<ul>
Modified: website/trunk/en/index.wml
===================================================================
--- website/trunk/en/index.wml 2010-10-09 20:20:37 UTC (rev 23508)
+++ website/trunk/en/index.wml 2010-10-09 20:27:08 UTC (rev 23509)
@@ -53,13 +53,13 @@
<table>
<tr>
<td>
- <img src="images/icon-default.jpg" alt="Default Icon" />
+ <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
<h3><a href="<page torbutton/index>">Torbutton</a></h3>
<p>Torbutton is a 1-click way for Firefox users to enable
or disable Tor in Firefox.</p>
</td>
<td>
- <img src="images/icon-default.jpg" alt="Default Icon" />
+ <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
<h3><a href="https://check.torproject.org";>Check</a></h3>
<p>Check will tell you if you are using browsing with
Tor successfully.</p>
@@ -67,14 +67,14 @@
</tr>
<tr>
<td>
- <img src="images/icon-default.jpg" alt="Default Icon" />
+ <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
<h3><a href="<page projects/vidalia>">Vidalia</a></h3>
<p>Vidalia is a graphical tool to allow you to see where
your connections are in the world and configure Tor without
getting into configuration files and code.</p>
</td>
<td>
- <img src="images/icon-default.jpg" alt="Default Icon" />
+ <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
<h3><a href="<page projects/torbrowser>">Tor
Browser</a></h3>
<p>Tor Browser contains everything you need to safely
@@ -91,27 +91,27 @@
<div id="torusers">
<h2>Who Uses Tor?</a></h2>
<div class="user">
- <a href="<page about/torusers>#normalusers"><img src="images/family.jpg" alt="Normal People" />
+ <a href="<page about/torusers>#normalusers"><img src="$(IMGROOT)/family.jpg" alt="Normal People" />
<h3>Family & Friends</h3></a>
<p>People like you and your family use Tor to protect themselves, their children, and their dignity while using the Internet.</p>
</div>
<div class="user">
- <a href="<page about/torusers>#executives"><img src="images/consumers.jpg" alt="Businesses" />
+ <a href="<page about/torusers>#executives"><img src="$(IMGROOT)/consumers.jpg" alt="Businesses" />
<h3>Businesses</h3></a>
<p>Businessess use Tor to research competition, keep strategies confidential, facilitating internal accountability.<p>
</div>
<div class="user">
- <a href="<page about/torusers>#activists"><img src="images/activists.jpg" alt="Activists & Whistleblowers" />
+ <a href="<page about/torusers>#activists"><img src="$(IMGROOT)/activists.jpg" alt="Activists & Whistleblowers" />
<h3>Activists</h3></a>
<p>Activists use Tor to anonymously report abuses from danger zones. Whistleblowers use Tor to safely report on corruption.</p>
</div>
<div class="user">
- <a href="<page about/torusers>#journalist"><img src="images/media.jpg" alt="Journalists and the Media" />
+ <a href="<page about/torusers>#journalist"><img src="$(IMGROOT)/media.jpg" alt="Journalists and the Media" />
<h3>Media</h3></a>
<p>Journalists and the Media use Tor to protect their research and sources online.</p>
</div>
<div class="user">
- <a href="<page about/torusers>#military"><img src="images/military.jpg" alt="Military and Law Enforcement" />
+ <a href="<page about/torusers>#military"><img src="$(IMGROOT)/military.jpg" alt="Military and Law Enforcement" />
<h3>Military & Law Enforcement</h3></a>
<p>Miltaries and Law Enforcement use Tor to protect their communications, investigations, and intelligence gathering online.</p>
</div>