Update download page for new release

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 25 insertions, 42 deletions

diff --git a/templates/public/download.html b/templates/public/download.html
index ce3f4ce2..513f80e4 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -4,11 +4,11 @@
 <div class="box">
     <h2 class="title">Release Info</h2>
     <div style="text-align:center">
-        <p>For new installations only.<br />
-        An Arch Linux system can always be updated with `pacman -Syu`</p>
+        <p>For new installations only.
+        An Arch Linux system can always be updated with `pacman -Syu`.</p>
 
-        <b>Current Release:</b> 2009.08 <br />
-        <b>Included Kernel:</b> 2.6.30-ARCH <br />
+        <b>Current Release:</b> 2010.05 <br />
+        <b>Included Kernel:</b> 2.6.33-ARCH <br />
         <b>Resources:</b>
             <a href="http://bugs.archlinux.org/index.php?project=6">Bug Tracker</a>
             -
@@ -16,7 +16,7 @@
             <br />
             <br />
         <b>Links and Instructions:</b><br />
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/instructions.txt">
+        <a href="http://www.archlinux.org/iso/2010.05/instructions.txt">
             Downloading Instructions
         </a>
         <br />
@@ -30,42 +30,26 @@
     </div>
     <h2 class="title">BitTorrent Download (recommended)</h2>
     <div style="text-align:center">
-		<p>If you can spare the bytes, please leave the client
-		open after your<br /> download is finished, so you can seed
-		it back to others.</p>
+        <p>If you can spare the bytes, please leave the client open after your
+        download is finished, so you can seed it back to others. A web-seed
+        capable client is recommended for fastest download speeds.</p>
 
-        <p>A web-seed capable client is recommended for fastest download
-        speeds</p>
-
-        <b>FTP ISOs:</b>
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/archlinux-2009.08-netinstall-i686.iso.torrent">i686</a>
+        <b>Netinstall ISOs:</b>
+        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-i686.iso.torrent">i686</a>
         -
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/archlinux-2009.08-netinstall-x86_64.iso.torrent">x86_64</a>
-        <br />
-
-        <b>Core ISOs:</b>
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/archlinux-2009.08-core-i686.iso.torrent">i686</a>
+        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-x86_64.iso.torrent">x86_64</a>
         -
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/archlinux-2009.08-core-x86_64.iso.torrent">x86_64</a>
+        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-dual.iso.torrent">Dual Arch</a>
         <br />
 
-        <b>FTP USB Images:</b>
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/archlinux-2009.08-netinstall-i686.img.torrent">i686</a>
+        <b>Core ISOs:</b>
+        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-i686.iso.torrent">i686</a>
         -
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/archlinux-2009.08-netinstall-x86_64.img.torrent">x86_64</a>
-        <br />
-
-        <b>Core USB Images:</b>
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/archlinux-2009.08-core-i686.img.torrent">i686</a>
+        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-x86_64.iso.torrent">x86_64</a>
         -
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/archlinux-2009.08-core-x86_64.img.torrent">x86_64</a>
+        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-dual.iso.torrent">Dual Arch</a>
         <br />
 
-        <b>ISOLINUX ISOs:</b>
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/archlinux-2009.08-netinstall-i686-isolinux.iso.torrent">i686</a>
-        -
-        <a href="ftp://ftp.archlinux.org/iso/2009.08/archlinux-2009.08-netinstall-x86_64-isolinux.iso.torrent">x86_64</a>
-
     </div>
     <h2 class="title">Buy A CD</h2>
     <div style="text-align:center">
@@ -93,16 +77,15 @@
     
     <h2 class="title">HTTP/FTP Download</h2>
     <div style="text-align:center">
-        <p>In addition to the BitTorrent links above, ISO images can also be downloaded <br />
-        via HTTP or FTP from the mirror sites listed below.</p>
-
-        <p>Please ensure the download image matches the checksum from the<br />
-        md5sums.txt or sha1sums.txt file in the same directory as the image.</p>
+        <p>In addition to the BitTorrent links above, ISO images can also be
+        downloaded via HTTP or FTP from the mirror sites listed below. Please
+        ensure the download image matches the checksum from the md5sums.txt or
+        sha1sums.txt file in the same directory as the image.</p>
         <h3>Checksums</h3>
         <p>
-            <a href="ftp://ftp.archlinux.org/iso/2009.08/sha1sums.txt">SHA1</a>
+            <a href="http://www.archlinux.org/iso/2010.05/sha1sums.txt">SHA1</a>
             <br />
-            <a href="ftp://ftp.archlinux.org/iso/2009.08/md5sums.txt">MD5</a>
+            <a href="http://www.archlinux.org/iso/2010.05/md5sums.txt">MD5</a>
         </p>
 
         <table class="center">
@@ -120,9 +103,9 @@
             {% endfor %}
             </td></tr>
         </table>
-	<p>If you want to become an Official Arch Linux Mirror please follow<br />
-	the instructions listed <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.
-	</p>
+    <p>If you want to become an Official Arch Linux Mirror please follow
+    the instructions listed <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.
+    </p>
     </div>
 </div>
 <br /><br />