torproject/webwml
1
0
Fork 0
mirror of https://github.com/torproject/webwml.git synced 2025-03-04 16:28:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git-rw.torproject.org:project/web/webwml into remove_rpms_from_sidenav

Browse Source
This commit is contained in:
hiromipaw 2018-01-30 12:04:40 +01:00
commit c94a7c2c55
5 changed files with 487 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -15,7 +15,7 @@
# website component, and set it to needs_review.
export STABLETAG=tor-0.3.2.9
#export DEVTAG=tor-0.3.2.8-rc
export DEVTAG=tor-0.3.3.1-alpha
WMLBASE=.
SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton

14
include/versions.wmi
View File

@ -1,12 +1,12 @@
<define-tag version-stable whitespace=delete>0.3.2.9</define-tag>
<!-- <define-tag version-alpha whitespace=delete>0.3.2.8-rc</define-tag> -->
<define-tag version-alpha whitespace=delete>0.3.3.1-alpha</define-tag>
<define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.0</define-tag>
<define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>
# *** tor browser stable ***
<define-tag version-torbrowserbundle-all whitespace=delete>7.0.11</define-tag>
<define-tag releasedate-torbrowserbundle-all whitespace=delete>2017-12-09</define-tag>
<define-tag version-win32-stable whitespace=delete>0.3.1.9</define-tag>
<define-tag version-torbrowserbundle-all whitespace=delete>7.5</define-tag>
<define-tag releasedate-torbrowserbundle-all whitespace=delete>2018-01-23</define-tag>
<define-tag version-win32-stable whitespace=delete>0.3.2.9</define-tag>
# If all platforms are on the same version, you only to update
# version-torbrowserbundle-all and releasedate-torbrowserbundle-all
@ -22,8 +22,8 @@
<define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag>
# *** tor browser beta/alpha ***
<define-tag version-torbrowserbundlebeta-all whitespace=delete>7.5a10</define-tag>
<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2017-12-20</define-tag>
<define-tag version-torbrowserbundlebeta-all whitespace=delete>8.0a1</define-tag>
<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2018-01-24</define-tag>
<define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.16</define-tag>
# If all platforms are on the same version, you only need to update

4
projects/en/torbrowser.wml
View File

@ -740,9 +740,9 @@
<a
href="https://www.torproject.org/projects/torbrowser/design/">design
document</a>, the <a
href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/Docs/ChangeLog.txt?h=<version-torbrowserdevelopbranch>">ChangeLog
href="https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=<version-torbrowserdevelopbranch>">ChangeLog
for the branch <version-torbrowserdevelopbranch></a>, and the <a
href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/Docs/ChangeLog.txt">ChangeLog
href="https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt">ChangeLog
for the alpha branch</a>.
</p>
<p><strong><em>How can I make my own bundle?</em></strong>

20
projects/torbrowser/RecommendedTBBVersions
View File

@ -1,14 +1,10 @@
[
"7.0.11",
"7.0.11-MacOS",
"7.0.11-Linux",
"7.0.11-Windows",
"7.5a9",
"7.5a9-MacOS",
"7.5a9-Linux",
"7.5a9-Windows",
"7.5a10",
"7.5a10-MacOS",
"7.5a10-Linux",
"7.5a10-Windows"
"7.5",
"7.5-MacOS",
"7.5-Linux",
"7.5-Windows",
"8.0a1",
"8.0a1-MacOS",
"8.0a1-Linux",
"8.0a1-Windows"
]

759
projects/torbrowser/design/index.html.en
View File

File diff suppressed because it is too large Load Diff