[tor-commits] r24685: {website} add bridge-by-default bundle link and some information about (in website/trunk: download/en include)

[Erinn Clark]

Author: erinn
Date: 2011-04-27 15:26:04 +0000 (Wed, 27 Apr 2011)
New Revision: 24685

Modified:
   website/trunk/download/en/download.wml
   website/trunk/include/versions.wmi
Log:
add bridge-by-default bundle link and some information about it to download page

Modified: website/trunk/download/en/download.wml
===================================================================
--- website/trunk/download/en/download.wml	2011-04-27 06:57:24 UTC (rev 24684)
+++ website/trunk/download/en/download.wml	2011-04-27 15:26:04 UTC (rev 24685)
@@ -20,10 +20,11 @@
 <td class="nopad"><div class="title"><a name="Windows">Microsoft Windows</a></div></td>
 </tr>
 <tr>
-<td>The Tor Software for Windows comes bundled in three different ways:
+<td>The Tor Software for Windows comes bundled in four different ways:
 <ul>
 <li>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></li>
 <li>The <strong>Vidalia Bundle</strong> contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, and Polipo for installation on your system.  You need to configure your applications to use Tor.</li>
+<li>The <strong>Bridge-by-Default Vidalia Bundle</strong> is a <strong>Vidalia Bundle</strong> which is configured to be a <a href="<page docs/bridges>">bridge</a> in order to help censored users reach the Tor network.
 <li>The <strong>Expert Package</strong> contains just Tor and nothing else.  You'll need to configure Tor and all of your applications manually.</li>
 </ul>
 <p>There are two versions of each package, a stable and alpha release.  Stable packages are released when we believe the features and code will not change for many months.  Alpha or unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number than the stable versions listed above, there is a much higher chance of serious reliability and security bugs in these downloads.  Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.</p>
@@ -54,8 +55,11 @@
  Stable Vidalia Bundle works with Windows 7, Vista, XP, <a href="<package-win32-bundle-stable>">Download Stable</a>&nbsp;(<a href="<package-win32-bundle-stable>.asc">sig</a>)
  </span></td>
  </tr>
- <tr class="gray"><td><span class="windows">Unstable Vidalia Bundles works with Windows 7, Vista, XP, <a href="<package-win32-bundle-alpha>">Download Unstable</a>&nbsp;(<a href="<package-win32-bundle-alpha>.asc">sig</a>)</span></td>
+ <tr class="gray"><td><span class="windows">Unstable Vidalia Bundle works with Windows 7, Vista, XP, <a href="<package-win32-bundle-alpha>">Download Unstable</a>&nbsp;(<a href="<package-win32-bundle-alpha>.asc">sig</a>)</span></td>
  </tr>
+ <tr><td><span class="windows">
+ <tr class="gray"><td><span class="windows">Unstable Bridge-by-Default Vidalia Bundle works with Windows 7, Vista, XP, <a href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.exe">Download Unstable</a>&nbsp;(<a href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.asc">sig</a>)</span></td>
+ </tr>
  <tr>
  <td><span class="windows">Stable Expert Bundle works with Windows 98SE, ME, Windows 7, Vista, XP, 2000, 2003 Server, <a href="../dist/win32/tor-<version-win32-stable>-win32.exe">Download Stable</a>&nbsp;(<a href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">sig</a>)</span></td>
 </tr>

Modified: website/trunk/include/versions.wmi
===================================================================
--- website/trunk/include/versions.wmi	2011-04-27 06:57:24 UTC (rev 24684)
+++ website/trunk/include/versions.wmi	2011-04-27 15:26:04 UTC (rev 24685)
@@ -7,6 +7,8 @@
 <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag>
 <define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.24-alpha</define-tag>
 
+<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.24-alpha-<version-vidalia-stable></define-tag>
+
 <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag>
 <define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.24-alpha</define-tag>