Browse code

remove relays directory.

Andrew Lewman authored on11/03/2012 23:34:29
Showing5 changed files
... ...
@@ -14,7 +14,7 @@ export STABLETAG=tor-0.2.2.35
14 14
 export DEVTAG=tor-0.2.3.12-alpha
15 15
 
16 16
 WMLBASE=.
17
-SUBDIRS=docs eff projects press about download getinvolved donate torbutton relays
17
+SUBDIRS=docs eff projects press about download getinvolved donate torbutton 
18 18
 include $(WMLBASE)/Makefile.local
19 19
 
20 20
 include $(WMLBASE)/Makefile.common
... ...
@@ -38,8 +38,6 @@ donate:
38 38
 	$(MAKE) -C "$@" WMLBASE=..  
39 39
 torbutton:
40 40
 	$(MAKE) -C "$@" WMLBASE=..  
41
-relays:
42
-	$(MAKE) -C "$@" WMLBASE=..  
43 41
 mirrors:
44 42
 	./update-mirrors.pl
45 43
 translations:
... ...
@@ -51,4 +49,4 @@ qrcode:
51 49
 # XXX: this also depends on all subs' wmlfiles.  How to fix?
52 50
 #translation-status.html.en: $(LANGS) $(WMIFILES) $(WMLFILES)
53 51
 
54
-.PHONY: docs eff projects press about download getinvolved donate torbutton relays
52
+.PHONY: docs eff projects press about download getinvolved donate torbutton
55 53
deleted file mode 100644
... ...
@@ -1 +0,0 @@
1
-include $(WMLBASE)/Makefile.common
2 0
deleted file mode 100644
... ...
@@ -1,52 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 3-low
4
-
5
-#include "head.wmi" TITLE="Tor Project: Press Page"
6
-<div id="content" class="clearfix">
7
-  <div id="breadcrumbs">
8
-    <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page press/press>">Press</a>
10
-  </div> 
11
-  <div id="maincol">
12
-    <!-- PUT CONTENT AFTER THIS TAG -->
13
-<h2>Tor Press and Media Information</h2>
14
-<div class="underline"></div>
15
-
16
-<h3>Press Releases</h3>
17
-<ul>
18
-<li>28 August 2011. The Tor Project announces a <a href="<page
19
-press/2011-08-28-tor-022-stable>">new stable release</a> of the Tor
20
-software.</li>
21
-<li>16 September 2010.  Tor announces an article discussing <a href="<page
22
-press/2010-09-16-ten-things-circumvention-tools>">Ten Things to Look
23
-for in a Circumvention Tool</a>.</li>
24
-<li>25 March 2010. Tor and Printfection launch <a href="<page
25
-press/2010-03-25-tor-store-press-release>">The Tor Store</a>.</li>
26
-<li>12 March 2009.  Tor launches a <a href="<page
27
-press/2009-03-12-performance-roadmap-press-release>">performance
28
-roadmap</a> and campaign.</li>
29
-<li>19 December 2008.  Tor announces 3-year <a href="<page
30
-press/2008-12-19-roadmap-press-release>">development roadmap</a>.</li>
31
-</ul>
32
-<br>
33
-<div class="nb">
34
-<h3>Quick links to better understand Tor</h3>
35
-<ol>
36
-<li>How is Tor <a href="<page docs/faq>#Torisdifferent">different than other proxy solutions</a>?</li>
37
-<li><a href="../press/presskit/General-Online-Anonymity-with-Tor.pdf">Why Online Privacy and Anonymity</a>?</li>
38
-<li><a href="../press/presskit/General-Background-on-Tor-Project-Inc.pdf">Who is the Tor Project, Inc.</a>?</li>
39
-<li><a href="<blog>circumvention-and-anonymity">Why anonymity matters for circumvention</a>.</li>
40
-</ol>
41
-</div>
42
-
43
-  </div>
44
-  <!-- END MAINCOL -->
45
-  <div id = "sidecol">
46
-#include "side.wmi"
47
-#include "info.wmi"
48
-  </div>
49
-  <!-- END SIDECOL -->
50
-</div>
51
-<!-- END CONTENT -->
52
-#include <foot.wmi> 
53 0
deleted file mode 100644
... ...
@@ -1,32 +0,0 @@
1
-#!/usr/bin/wml
2
-
3
-## translation metadata
4
-# Revision: $Revision$
5
-# Translation-Priority: 2-medium
6
-
7
-# this structure defines the side nav bar for the /press pages
8
-# and is the input for include/side.wmi
9
-
10
-# fields:
11
-#
12
-# url - the path to the wml page, as used the the <page> tag. This tag ensures
13
-# that links will point to the current language if supported, and alternately
14
-# the english version 
15
-#
16
-# txt - the link text to be displayed. Different translations will
17
-# need to supply alternate txt  
18
-
19
-<:
20
-  my $sidenav;
21
-  $sidenav = [
22
-      {'url'  => 'press/press',
23
-       'txt'  => 'Press Releases',
24
-      }, 
25
-      {'url'  => 'press/inthemedia',
26
-       'txt'  => 'Tor in the Media',
27
-      }, 
28
-      {'url'  => 'https://blog.torproject.org/',
29
-       'txt'  => 'Tor Blog',
30
-      }, 
31
-  ];
32
-:>
33 0
deleted file mode 100644
... ...
@@ -1,166 +0,0 @@
1
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
2
-<html>
3
-<head>
4
-  <title>Tor Project: Press Page</title>
5
-  <link rel="shortcut icon" type="image/x-icon" href="../images/favicon.ico">
6
-  <link rel="stylesheet" type="text/css" href="../css/master.css">
7
-  <!--[if lte IE 8]>
8
-  <link rel="stylesheet" type="text/css" href="../css/ie8-and-down.css">
9
-  <![endif]-->
10
-  <!--[if lte IE 7]>
11
-  <link rel="stylesheet" type="text/css" href="../css/ie7-and-down.css">
12
-  <![endif]-->
13
-  <!--[if IE 6]>
14
-  <link rel="stylesheet" type="text/css" href="../css/ie6.css">
15
-  <![endif]-->
16
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
17
-  <meta name="author" content="The Tor Project, Inc.">
18
-  <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
19
-</head>
20
-<body>
21
-<div id="wrap">
22
-  <div id="header">
23
-    <h1 id="logo"><a href="../index.html.en">Tor</a></h1>
24
-      <div id="nav">
25
-        <ul>
26
-        <li><a href="../index.html.en">Home</a></li>
27
-<li><a href="../about/overview.html.en">About Tor</a></li>
28
-<li><a href="../docs/documentation.html.en">Documentation</a></li>
29
-<li><a href="../projects/projects.html.en">Projects</a></li>
30
-<li><a href="../press/press.html.en">Press</a></li>
31
-<li><a href="https://blog.torproject.org/blog/">Blog</a></li>
32
-<li><a href="http://www.printfection.com/torprojectstore">Store</a></li>
33
-        </ul>
34
-      </div>
35
-      <!-- END NAV -->
36
-      <div id="calltoaction">
37
-        <ul>
38
-          <li class="donate"><a href="../download/download-easy.html.en">Download</a></li>
39
-<li class="donate"><a href="../getinvolved/volunteer.html.en">Volunteer</a></li>
40
-<li class="donate"><a href="../donate/donate.html.en">Donate</a></li>
41
-        </ul>
42
-      </div>
43
-      <!-- END CALLTOACTION -->
44
-  </div>
45
-  <!-- END HEADER -->
46
-<div id="content" class="clearfix">
47
-  <div id="breadcrumbs">
48
-    <a href="../index.html.en">Home &raquo; </a>
49
-    <a href="../press/press.html.en">Press</a>
50
-  </div>
51
-  <div id="maincol">
52
-    <!-- PUT CONTENT AFTER THIS TAG -->
53
-<h2>Tor Press and Media Information</h2>
54
-<div class="underline"></div>
55
-<h3>Press Releases</h3>
56
-<ul>
57
-<li>28 August 2011. The Tor Project announces a <a href="../press/2011-08-28-tor-022-stable.html.en">new stable release</a> of the Tor
58
-software.</li>
59
-<li>16 September 2010. Tor announces an article discussing <a href="../press/2010-09-16-ten-things-circumvention-tools.html.en">Ten Things to Look
60
-for in a Circumvention Tool</a>.</li>
61
-<li>25 March 2010. Tor and Printfection launch <a href="../press/2010-03-25-tor-store-press-release.html.en">The Tor Store</a>.</li>
62
-<li>12 March 2009. Tor launches a <a href="../press/2009-03-12-performance-roadmap-press-release.html.en">performance
63
-roadmap</a> and campaign.</li>
64
-<li>19 December 2008. Tor announces 3-year <a href="../press/2008-12-19-roadmap-press-release.html.en">development roadmap</a>.</li>
65
-</ul>
66
-<br>
67
-<div class="nb">
68
-<h3>Quick links to better understand Tor</h3>
69
-<ol>
70
-<li>How is Tor <a href="../docs/faq.html.en#Torisdifferent">different than other proxy solutions</a>?</li>
71
-<li><a href="../press/presskit/General-Online-Anonymity-with-Tor.pdf">Why Online Privacy and Anonymity</a>?</li>
72
-<li><a href="../press/presskit/General-Background-on-Tor-Project-Inc.pdf">Who is the Tor Project, Inc.</a>?</li>
73
-<li><a href="https://blog.torproject.org/blog/circumvention-and-anonymity">Why anonymity matters for circumvention</a>.</li>
74
-</ol>
75
-</div>
76
-  </div>
77
-  <!-- END MAINCOL -->
78
-  <div id="sidecol">
79
-<div class="img-shadow">
80
-  <div id="sidenav">
81
-    <ul>
82
-<li><a href="../press/press.html.en">Press Releases</a></li>
83
-<li><a href="../press/inthemedia.html.en">Tor in the Media</a></li>
84
-<li><a href="https://blog.torproject.org/">Tor Blog</a></li>
85
-</ul>
86
-  </div>
87
-  <!-- END SIDENAV -->
88
-</div>
89
-<!-- END IMG-SHADOW -->
90
-<div class="img-shadow">
91
-  <div class="infoblock">
92
-    <h2 class="bulb">Tor Tip</h2>
93
-    <p>Tor is written for and supported by people like you. <a href="../donate/donate.html.en">Donate today</a>!</p>
94
-  </div>
95
-  <!-- END INFOBLOCK -->
96
-</div>
97
-<!-- END IMG-SHADOW -->
98
-  </div>
99
-  <!-- END SIDECOL -->
100
-</div>
101
-<!-- END CONTENT -->
102
-    <div id="footer">
103
-    	<div class="onion"><img src="../images/onion.jpg" alt="Tor" width="78" height="118"></div>
104
-      <div class="about">
105
-	<p>"Tor" and the "Onion Logo" are registered trademarks of
106
-	<a href="../docs/trademark-faq.html.en">The Tor Project, Inc.</a>
107
-	Content on this site is licensed under a <a
108
-	href="http://creativecommons.org/licenses/by/3.0/us/">Creative
109
-	Commons Attribution 3.0 United States License</a>, unless
110
-	otherwise noted.</p>
111
-<!--
112
-        Last modified: Sun Mar 11 03:39:56 2012 +0000
113
-        Last compiled: Sun Mar 11 2012 22:11:09 +0100
114
-      </div>
115
-      <!-- END ABOUT -->
116
-      <!-- WE HAVE NO NEWSLETTER SO REMOVE THIS
117
-      <div class="newsletter">
118
-        <form action="">
119
-          <input class="textfield" type="text" name="email" value="Sign up for our newsletter! Enter email." onClick="clearDefault(this);">
120
-          <input class="signup" type="submit" name="submit" value="Sign Up">
121
-        </form>
122
-      </div>
123
-      END NEWSLETTER -->
124
-      <div class="col first">
125
-      	<h4>About Tor</h4>
126
-        <ul>
127
-          <li><a href="../about/overview.html.en">What Tor Does</a></li>
128
-          <li><a href="../about/torusers.html.en">Users of Tor</a></li>
129
-          <li><a href="../about/corepeople.html.en">Core Tor People</a></li>
130
-          <li><a href="../about/sponsors.html.en">Sponsors</a></li>
131
-          <li><a href="../about/contact.html.en">Contact Us</a></li>
132
-        </ul>
133
-      </div>
134
-      <!-- END COL -->
135
-      <div class="col">
136
-      	<h4>Get Involved</h4>
137
-        <ul>
138
-          <li><a href="../donate/donate.html.en">Donate</a></li>
139
-          <li><a href="../docs/documentation.html.en#MailingLists">Mailing List</a></li>
140
-          <li><a href="../getinvolved/mirrors.html.en">Mirrors</a></li>
141
-          <li><a href="../docs/hidden-services.html.en">Hidden Services</a></li>
142
-          <li><a href="../getinvolved/translation.html.en">Translations</a></li>
143
-        </ul>
144
-      </div>
145
-      <!-- END COL -->
146
-      <div class="col">
147
-      	<h4>Documentation</h4>
148
-        <ul>
149
-          <li><a href="../docs/tor-manual.html.en">Manuals</a></li>
150
-          <li><a href="../docs/documentation.html.en">Installation Guides</a></li>
151
-          <li><a href="https://trac.torproject.org/projects/tor/wiki/">Tor Wiki</a></li>
152
-          <li><a href="../docs/faq.html.en">General Tor FAQ</a></li>
153
-        </ul>
154
-      </div>
155
-      <!-- END COL -->
156
-	<!-- List available languages -->
157
-	<div class="col wider">
158
-	<h4>Languages</h4>
159
-	</div>
160
-    </div>
161
-    <!-- END FOOTER -->
162
-  </div>
163
-  <!-- END WRAP -->
164
-</body>
165
-</html>