[or-cvs] r23443: {website} remove the glossary. fix up the rtfm link on the download pa (in website/branches/web20: docs/en download/en include)
Andrew Lewman
andrew at torproject.org
Thu Oct 7 16:09:58 UTC 2010
Author: phobos
Date: 2010-10-07 16:09:57 +0000 (Thu, 07 Oct 2010)
New Revision: 23443
Removed:
website/branches/web20/docs/en/glossary.wml
Modified:
website/branches/web20/docs/en/sidenav.wmi
website/branches/web20/download/en/download.wml
website/branches/web20/include/foot.wmi
website/branches/web20/include/info.wmi
Log:
remove the glossary. fix up the rtfm link on the download page.
Deleted: website/branches/web20/docs/en/glossary.wml
===================================================================
--- website/branches/web20/docs/en/glossary.wml 2010-10-07 15:52:43 UTC (rev 23442)
+++ website/branches/web20/docs/en/glossary.wml 2010-10-07 16:09:57 UTC (rev 23443)
@@ -1,24 +0,0 @@
-## translation metadata
-# Revision: $Revision: 22359 $
-# Translation-Priority: 2-medium
-
-#include "head.wmi" TITLE="Tor: Glossary" CHARSET="UTF-8"
-<div id="content" class="clearfix">
- <div id="breadcrumbs">
- <a href="<page index>">Home » </a>
- <a href="<page docs/documentation>">Documentation » </a>
- <a href="<page docs/documentation>">Glossary</a>
- </div>
- <div id="maincol">
-
- <h1>Tor Glossary</h1>
- </div>
- <!-- END MAINCOL -->
- <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
- </div>
- <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>
Modified: website/branches/web20/docs/en/sidenav.wmi
===================================================================
--- website/branches/web20/docs/en/sidenav.wmi 2010-10-07 15:52:43 UTC (rev 23442)
+++ website/branches/web20/docs/en/sidenav.wmi 2010-10-07 16:09:57 UTC (rev 23443)
@@ -56,9 +56,6 @@
'txt' => 'Tor -alpha Manual',
}],
},
- {'url' => 'docs/glossary',
- 'txt' => 'Glossary',
- },
{
'url' => '<wiki>',
'txt' => 'Tor Wiki',
Modified: website/branches/web20/download/en/download.wml
===================================================================
--- website/branches/web20/download/en/download.wml 2010-10-07 15:52:43 UTC (rev 23442)
+++ website/branches/web20/download/en/download.wml 2010-10-07 16:09:57 UTC (rev 23443)
@@ -48,7 +48,7 @@
</table>
<table class="topforty">
<tr>
- <td class="nopad" colspan="5"><div class="title"><a name="tbb">Tor Instant Messaging Browser Bundles</a></div></td>
+ <td class="nopad" colspan="5"><div class="title"><a name="tbb">Tor Instant Messager Browser Bundles</a></div></td>
</tr>
<tr>
<td><span class="column-title">Language</span></td>
@@ -137,7 +137,7 @@
<td><span class="mac">Mac (Intel)</span></td>
<td>Intel only</td>
<td><a href="/dist/osx/Tor-<version-osx-stable>-i386-Bundle.dmg"><version-osx-stable></a></td>
- <td><a href="/dist/osx/Tor-<version-osx-alpha>-i386-Bundle.dmg"></a><version-osx-alpha></td>
+ <td><a href="/dist/osx/Tor-<version-osx-alpha>-i386-Bundle.dmg"><version-osx-alpha></a></td>
<td><a href="<page docs/tor-doc-osx>">Mac (Intel)</a></td>
</tr>
<tr class="beige">
@@ -201,8 +201,7 @@
<li>
Tor anonymizes the origin of your traffic, and it encrypts everything
between you and the Tor network and everything inside the Tor network,
-but <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor">it
+but <a href="<wiki>TorFAQ#SoImtotallyanonymousifIuseTor">it
can't encrypt your traffic between the Tor network and its final
destination.</a> If you are communicating sensitive information, you
should use as much care as you would on the normal scary Internet —
@@ -257,14 +256,8 @@
<div class="img-shadow">
<div class="sidenav-sub">
<h2>Having Trouble?</h2>
- <ul>
- <li class="dropdown"><a href="#">What are the differences between stable and unstable downloads?</a></li>
- <li class="dropdown"><a href="#">Why is the TorBrowser Bundle only available for Windows?</a></li>
- <li class="dropdown"><a href="#">What is the Expert Developer Package?</a></li>
- <li class="dropdown"><a href="#">What are the differences between stable and unstable downloads?</a></li>
- <li class="dropdown"><a href="#">Why is the TorBrowser Bundle only available for Windows?</a></li>
- <li class="dropdown"><a href="#">What is the Expert Developer Package?</a></li>
- </ul>
+ <ul>
+ <li class="dropdown"><a href="<page docs/documentation>">Read the fine manuals</a></li>
</div>
</div>
<!-- END SIDENAV -->
Modified: website/branches/web20/include/foot.wmi
===================================================================
--- website/branches/web20/include/foot.wmi 2010-10-07 15:52:43 UTC (rev 23442)
+++ website/branches/web20/include/foot.wmi 2010-10-07 16:09:57 UTC (rev 23443)
@@ -64,8 +64,7 @@
<ul>
<li><a href="<page docs/tor-manual>">Manuals</a></li>
<li><a href="<page docs/documentation>">Installation Guides</a></li>
- <li><a href="<page docs/glossary>">Glossary</a></li>
- <li><a href="https://trac.torproject.org/wiki/">Tor Wiki</a></li>
+ <li><a href="<wiki>">Tor Wiki</a></li>
<li><a href="<page docs/faq>">FAQ</a></li>
</ul>
</div>
Modified: website/branches/web20/include/info.wmi
===================================================================
--- website/branches/web20/include/info.wmi 2010-10-07 15:52:43 UTC (rev 23442)
+++ website/branches/web20/include/info.wmi 2010-10-07 16:09:57 UTC (rev 23443)
@@ -2,8 +2,8 @@
<div class="img-shadow">
<div class="infoblock">
<h2 class="bulb">Tor Tip</h2>
- <p>Want to get the most out of Tor? Understand what Tor <a
-href="<page download/download>#warning">does and does not do</a> to protect you!</p>
+ <p>Tor is written for and supported by people like you, <a href="<page
+donate/donate>">donate today</a>!</p>
</div>
<!-- END INFOBLOCK -->
</div>
More information about the tor-commits
mailing list