[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r23267: {website} more press fixes, sync with main website some more. (in website/branches/web20: . en press/en)
Author: phobos
Date: 2010-09-20 20:08:24 +0000 (Mon, 20 Sep 2010)
New Revision: 23267
Modified:
website/branches/web20/Makefile
website/branches/web20/en/navigation.wmi
website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml
website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml
website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml
website/branches/web20/press/en/index.wml
website/branches/web20/press/en/inthemedia.wml
website/branches/web20/press/en/sidenav.wmi
website/branches/web20/publish
website/branches/web20/update-mirrors.pl
Log:
more press fixes, sync with main website some more.
Modified: website/branches/web20/Makefile
===================================================================
--- website/branches/web20/Makefile 2010-09-20 18:59:28 UTC (rev 23266)
+++ website/branches/web20/Makefile 2010-09-20 20:08:24 UTC (rev 23267)
@@ -53,6 +53,6 @@
"https://www.torproject.org/dist/android/alpha-orbot-latest.apk";
# XXX: this also depends on all subs' wmlfiles. How to fix?
-translation-status.html.en: $(LANGS) $(WMIFILES) $(WMLFILES)
+#translation-status.html.en: $(LANGS) $(WMIFILES) $(WMLFILES)
.PHONY: docs eff projects press about download download getinvolved donate
Modified: website/branches/web20/en/navigation.wmi
===================================================================
--- website/branches/web20/en/navigation.wmi 2010-09-20 18:59:28 UTC (rev 23266)
+++ website/branches/web20/en/navigation.wmi 2010-09-20 20:08:24 UTC (rev 23267)
@@ -11,7 +11,7 @@
'about/about' , 'About Tor',
'docs/documentation' , 'Documentation',
'projects/clientside' , 'Projects',
- 'press' , 'Press',
+ 'press/index' , 'Press',
'https://blog.torproject.org' , 'Blog',
'http://printfection.com/torprojectstore' , 'Store',
);
Modified: website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml
===================================================================
--- website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml 2010-09-20 18:59:28 UTC (rev 23266)
+++ website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml 2010-09-20 20:08:24 UTC (rev 23267)
@@ -6,7 +6,7 @@
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home » </a>
- <a href="<page press/>">Press » </a>
+ <a href="<page press>">Press » </a>
<a href="<page press/2008-12-19-roadmap-press-release>">Tor Project Announces Three-Year Development Roadmap</a>
</div>
<div id="maincol">
Modified: website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml
===================================================================
--- website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml 2010-09-20 18:59:28 UTC (rev 23266)
+++ website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml 2010-09-20 20:08:24 UTC (rev 23267)
@@ -6,7 +6,7 @@
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home » </a>
- <a href="<page press/index>">Press » </a>
+ <a href="<page press/>">Press » </a>
<a href="<page press/2009-03-12-performance-roadmap-press-release>">Tor Project Launches Performance Roadmap and Campaign</a>
</div>
<div id="maincol">
Modified: website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml
===================================================================
--- website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml 2010-09-20 18:59:28 UTC (rev 23266)
+++ website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml 2010-09-20 20:08:24 UTC (rev 23267)
@@ -6,7 +6,7 @@
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home » </a>
- <a href="<page press/index>">Press » </a>
+ <a href="<page press/>">Press » </a>
<a href="<page press/2010-03-25-tor-store-press-release>">Tor Project And Printfection Announce the Tor Store</a>
</div>
<div id="maincol">
Modified: website/branches/web20/press/en/index.wml
===================================================================
--- website/branches/web20/press/en/index.wml 2010-09-20 18:59:28 UTC (rev 23266)
+++ website/branches/web20/press/en/index.wml 2010-09-20 20:08:24 UTC (rev 23267)
@@ -6,7 +6,7 @@
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home » </a>
- <a href="<page press/>">Press</a>
+ <a href="<page press>">Press</a>
</div>
<div id="maincol">
<!-- PUT CONTENT AFTER THIS TAG -->
Modified: website/branches/web20/press/en/inthemedia.wml
===================================================================
--- website/branches/web20/press/en/inthemedia.wml 2010-09-20 18:59:28 UTC (rev 23266)
+++ website/branches/web20/press/en/inthemedia.wml 2010-09-20 20:08:24 UTC (rev 23267)
@@ -6,7 +6,7 @@
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home » </a>
- <a href="<page press/index>">Press » </a>
+ <a href="<page press/>">Press » </a>
<a href="<page press/inthemedia>">Tor in the Media</a>
</div>
<div id="maincol">
Modified: website/branches/web20/press/en/sidenav.wmi
===================================================================
--- website/branches/web20/press/en/sidenav.wmi 2010-09-20 18:59:28 UTC (rev 23266)
+++ website/branches/web20/press/en/sidenav.wmi 2010-09-20 20:08:24 UTC (rev 23267)
@@ -19,7 +19,7 @@
<:
my $sidenav;
$sidenav = [
- {'url' => 'press/index',
+ {'url' => 'press/',
'txt' => 'Press Releases',
},
{'url' => 'press/inthemedia',
Modified: website/branches/web20/publish
===================================================================
--- website/branches/web20/publish 2010-09-20 18:59:28 UTC (rev 23266)
+++ website/branches/web20/publish 2010-09-20 20:08:24 UTC (rev 23267)
@@ -16,7 +16,8 @@
## since if they screw up it'll blow away arbitrary things.
#rsync -Prvz --delete . tor.eff.org:directory/
-rsync --exclude .svn --exclude .deps -Prvz . byblos:/var/www/www.torproject.org/htdocs/
+rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi -Prvz --delete . byblos:/var/www/www.torproject.org/htdocs/
+ssh byblos chmod g+w -R /var/www/www.torproject.org/htdocs
echo "Forcing mirror update"
ssh byblos '/var/lib/mirror-tor/trigger-sync'
Modified: website/branches/web20/update-mirrors.pl
===================================================================
--- website/branches/web20/update-mirrors.pl 2010-09-20 18:59:28 UTC (rev 23266)
+++ website/branches/web20/update-mirrors.pl 2010-09-20 20:08:24 UTC (rev 23267)
@@ -160,26 +160,6 @@
updateDate => "Unknown",
},
- mirror004 => {
- adminContact => "doc DOT kuehn AT nexgo DOT de",
- orgName => " spacecowboy ",
- isoCC => " ",
- subRegion => "",
- region => "DE",
- ipv4 => "True",
- ipv6 => "False",
- loadBalanced => "No",
- httpWebsiteMirror => "http://tor-proxy.de/tor-mirror/";,
- httpsWebsiteMirror => "https://tor-proxy.de/tor-mirror/";,
- rsyncWebsiteMirror => "",
- ftpWebsiteMirror => "",
- httpDistMirror => "http://tor-proxy.de/tor-mirror/dist/";,
- httpsDistMirror => "https://tor-proxy.de/tor-mirror/dist/";,
- rsyncDistMirror => "",
- hiddenServiceMirror => "",
- updateDate => "Unknown",
- },
-
mirror005 => {
adminContact => "contact AT algorithmus DOT com",
orgName => "Spline",