- Update URLs and presentation because of cdimage.debian.org reorganization

- Include daily builds again (sid_d-i)

CVS version numbers

english/devel/debian-installer/images.data: 1.7 -> 1.8 
english/devel/debian-installer/index.wml: 1.164 -> 1.165

2 files changed, 52 insertions, 20 deletions

diff --git a/english/devel/debian-installer/images.data b/english/devel/debian-installer/images.data
index c81d05910c2..e112fecdaba 100644
--- a/english/devel/debian-installer/images.data
+++ b/english/devel/debian-installer/images.data
@@ -1,19 +1,32 @@
 #include wml::debian::installer
 
 <define-tag netinst-images>
-<images-list url="http://cdimage.debian.org/pub/cdimage-testing/etch_d-i/@ARCH@/beta1/debian-testing-@ARCH@-netinst.iso" arch="<strip-arches "<devel-images-arches />" "s390 source" />" />
+<images-list url="http://cdimage.debian.org/cdimage/daily-builds/etch_d-i/beta1/@ARCH@/iso-cd/debian-testing-@ARCH@-netinst.iso" arch="<strip-arches "<devel-images-arches />" "s390 source" />" />
 </define-tag>
 
 <define-tag businesscard-images>
-<images-list url="http://cdimage.debian.org/pub/cdimage-testing/etch_d-i/@ARCH@/beta1/debian-testing-@ARCH@-businesscard.iso" arch="<strip-arches "<devel-images-arches />" "s390 source" />" />
+<images-list url="http://cdimage.debian.org/cdimage/daily-builds/etch_d-i/beta1/@ARCH@/iso-cd/debian-testing-@ARCH@-businesscard.iso" arch="<strip-arches "<devel-images-arches />" "s390 source" />" />
 </define-tag>
 
 <define-tag full-cd-images>
-<images-list url="http://cdimage.debian.org/pub/weekly/@ARCH@/" arch="<strip-arches "<devel-images-arches />" "s390" />" />
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta1/@ARCH@/iso-cd" arch="<strip-arches "<devel-images-arches />" "s390" />" />
+</define-tag>
+<define-tag full-dvd-images>
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta1/@ARCH@/iso-dvd" arch="<strip-arches "<devel-images-arches />" "s390" />" />
+</define-tag>
+
+<define-tag full-cd-jigdo>
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta1/@ARCH@/jigdo-cd" arch="<strip-arches "<devel-images-arches />" "s390" />" />
+</define-tag>
+<define-tag full-dvd-jigdo>
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta1/@ARCH@/jigdo-dvd" arch="<strip-arches "<devel-images-arches />" "s390" />" />
 </define-tag>
 
 <define-tag full-cd-torrent>
-<images-list url="http://cdimage.debian.org/pub/weekly/torrents/@ARCH@/" arch="<strip-arches "<devel-images-arches />" "s390" />" />
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta1/@ARCH@/bt-cd" arch="<strip-arches "<devel-images-arches />" "s390" />" />
+</define-tag>
+<define-tag full-dvd-torrent>
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta1/@ARCH@/bt-dvd" arch="<strip-arches "<devel-images-arches />" "s390" />" />
 </define-tag>
 
 <define-tag other-images>
@@ -24,19 +37,32 @@
 
 
 <define-tag devel-netinst-images>
-<images-list url="http://cdimage.debian.org/pub/cdimage-testing/daily/@ARCH@/current/debian-testing-@ARCH@-netinst.iso" arch="<strip-arches "<devel-images-arches />" "s390 source" />" />
+<images-list url="http://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/@ARCH@/iso-cd/debian-testing-@ARCH@-netinst.iso" arch="<strip-arches "<devel-images-arches />" "s390 source" />" />
 </define-tag>
 
 <define-tag devel-businesscard-images>
-<images-list url="http://cdimage.debian.org/pub/cdimage-testing/daily/@ARCH@/current/debian-testing-@ARCH@-businesscard.iso" arch="<strip-arches "<devel-images-arches />" "s390 source" />" />
+<images-list url="http://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/@ARCH@/iso-cd/debian-testing-@ARCH@-businesscard.iso" arch="<strip-arches "<devel-images-arches />" "s390 source" />" />
 </define-tag>
 
 <define-tag devel-full-cd-images>
-<images-list url="http://cdimage.debian.org/pub/weekly/@ARCH@/" arch="<devel-images-arches />" />
+<images-list url="http://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/iso-cd" arch="<devel-images-arches />" />
+</define-tag>
+<define-tag devel-full-dvd-images>
+<images-list url="http://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/iso-dvd" arch="<devel-images-arches />" />
+</define-tag>
+
+<define-tag devel-full-cd-jigdo>
+<images-list url="http://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/jigdo-cd" arch="<devel-images-arches />" />
+</define-tag>
+<define-tag devel-full-dvd-jigdo>
+<images-list url="http://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/jigdo-dvd" arch="<devel-images-arches />" />
 </define-tag>
 
 <define-tag devel-full-cd-torrent>
-<images-list url="http://cdimage.debian.org/pub/weekly/torrents/@ARCH@/" arch="<devel-images-arches />" />
+<images-list url="http://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/bt-cd" arch="<devel-images-arches />" />
+</define-tag>
+<define-tag devel-full-dvd-torrent>
+<images-list url="http://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/bt-dvd" arch="<devel-images-arches />" />
 </define-tag>
 
 <define-tag devel-other-images>
diff --git a/english/devel/debian-installer/index.wml b/english/devel/debian-installer/index.wml
index 8a094e86fa3..e1ab15a8757 100644
--- a/english/devel/debian-installer/index.wml
+++ b/english/devel/debian-installer/index.wml
@@ -40,9 +40,11 @@ beta 1:
 #	<li>full CD sets (via <a href="$(HOME)/CD/torrent-cd">bittorrent</a>)<br>
 #	<full-cd-torrent />
 #	</li>
-	<li>full <a href="http://cdimage.debian.org/pub/cdimage-testing/cd/beta1/">CD</a>
-	and <a href="http://cdimage.debian.org/pub/cdimage-testing/dvd/beta1/">DVD</a>
-	sets (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)
+	<li>full CD sets (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)<br>
+	<full-cd-jigdo />
+	</li>
+	<li>full DVD sets (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)<br>
+	<full-dvd-jigdo />
 	</li>
 	<li>graphical installer (alpha release)<br>
 	[<a href="http://people.debian.org/~fjp/d-i/gtk-miniiso/alpha/amd64/">amd64</a>]
@@ -53,8 +55,6 @@ beta 1:
 	</li>
 </ul>
 
-<!-- disabled for the beta release to prevent confusion , will reenable a few days after
-
 <p>
 <b>If you'd like something newer</b> to help us test a future release of the
 installer, or because of hardware problems or other issues,
@@ -73,20 +73,26 @@ issues</a>.
 	<li>full CD sets<br>
 	<devel-full-cd-images />
 	</li>
-	<li>full <a href="http://cdimage.debian.org/pub/cdimage-testing/cd/jigdo-area">CD</a>
-	and <a href="http://cdimage.debian.org/pub/cdimage-testing/dvd/jigdo-area">DVD</a>
-	sets (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)
+	<li>full DVD sets<br>
+	<devel-full-dvd-images />
 	</li>
-	<li>full CD sets (via <a href="$(HOME)/CD/torrent-cd">bittorrent</a>)<br>
-	<devel-full-cd-torrent />
+	<li>full CD sets (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)</a><br>
+	<devel-full-cd-jigdo />
 	</li>
+	<li>full DVD sets (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)</a><br>
+	<devel-full-dvd-jigdo />
+	</li>
+#	<li>full CD sets (via <a href="$(HOME)/CD/torrent-cd">bittorrent</a>)<br>
+#	<devel-full-cd-torrent />
+#	</li>
+#	<li>full DVD sets (via <a href="$(HOME)/CD/torrent-cd">bittorrent</a>)<br>
+#	<devel-full-dvd-torrent />
+#	</li>
 	<li>other images (netboot, usb stick, floppy, tape, etc)<br>
 	<devel-other-images />
 	</li>
 </ul>
 
--->
-
 <p>
 <b>After using the Debian-Installer</b>, please send us an
 <a href="http://d-i.alioth.debian.org/manual/en.i386/ch05s03.html#submit-bug">installation report</a>,