[SCM] wiki-content branch, master, updated. d1c429fd0666e79d9089a75ab412534e62086179

[Daniel Baumann]

The following commit has been merged in the master branch:
commit d1c429fd0666e79d9089a75ab412534e62086179
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Oct 30 09:10:55 2010 +0200

    Adding links for 6.0 beta1 release.

diff --git a/index.mdwn b/index.mdwn
index b5026ab..462de21 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -5,8 +5,7 @@
 
 	<ul>
 		<li><a href="archive">Archive</a></li>
-		<!-- <li><b>Download releases:</b> <a href="http://cdimage.debian.org/cdimage/release/current-live/">stable</a> <a href="http://cdimage.debian.org/cdimage/squeeze_live_alpha2/">testing</a></li> -->
-		<li><b>Download releases:</b> <a href="http://cdimage.debian.org/cdimage/release/current-live/">stable</a></li>
+		<li><b>Download releases:</b> <a href="http://cdimage.debian.org/cdimage/release/current-live/">stable</a> <a href="http://cdimage.debian.org/cdimage/squeeze_live_beta1/">testing</a></li>
 		<li><b>Download snapshots:</b> <a href="cdimage/daily-builds">daily</a> <a href="cdimage/weekly-builds">weekly</a> <a href="cdimage/monthly-builds">monthly</a></li>
 		<li><b>Manual</b>: <a href="/manual/en">en</a> <a href="/manual/de">de</a> <a href="/manual/fr">fr</a> <a href="/manual/pt_BR">pt_BR</a> <a href="/manual/ro">ro</a></li>
 		<li><a href="http://lists.debian.org/debian-live/">Mailinglist</a></li>
diff --git a/project/news.mdwn b/project/news.mdwn
index 4b38365..f722a7d 100644
--- a/project/news.mdwn
+++ b/project/news.mdwn
@@ -2,6 +2,9 @@
 
 ## 2010
 
+  * 2010-10-29: [Debian Live Squeeze beta1](http://cdimage.debian.org/cdimage/squeeze_live_beta1/)<br />
+    Debian Squeeze beta1 was released.
+
   * 2010-10-06: [Autobuilding live images](http://lists.debian.org/debian-live/2010/10/msg00098.html)<br />
     Automatic build of live images is back at <a href="http://live.debian.net/cdimage/">live.debian.net/cdimage</a>.
 
diff --git a/project/releases.mdwn b/project/releases.mdwn
index 1f8b45d..b80e948 100644
--- a/project/releases.mdwn
+++ b/project/releases.mdwn
@@ -2,8 +2,9 @@
 
 ## 6.0 "squeeze"
 
-  * [6.0 alpha2](http://cdimage.debian.org/cdimage/squeeze_live_alpha2/): 2010-07-21
-  * [6.0 alpha1](http://cdimage.debian.org/cdimage/archive/6.0_alpha1/): 2010-03-14
+  * [6.0 beta1](http://cdimage.debian.org/cdimage/squeeze_live_beta1/): 2010-10-29
+  * [6.0 alpha2](http://live.debian.net/archive/images/6.0_alpha2/): 2010-07-21
+  * [6.0 alpha1](http://live.debian.net/archive/images/6.0_alpha1/): 2010-03-14
 
 ## 5.0 "lenny"
 

-- 
wiki-content