Simplify future updates for releases by restructuring links to CD and

other images:
- clean up template/debian/release_images and rename tags to be codename-
  independant (e.g. lenny-netinst-images -> stable-netinst-images)
- update pages using these tags and remove their if-stable-update tags
  (distrib/netinst.wml several pages under CD/)
- make tags in releases/etch/debian-installer similar to the sarge page;
- use the same structure for releases/lenny/debian-installer, but base
  the tags in releases/lenny/release.data on the stable- tags to avoid
  double updates for point releases; document this + update procedure

CVS version numbers

english/CD/http-ftp/index.wml: 1.48 -> 1.49 
english/CD/jigdo-cd/index.wml: 1.72 -> 1.73 
english/CD/netinst/index.wml: 1.56 -> 1.57 
english/CD/torrent-cd/index.wml: 1.27 -> 1.28 
english/distrib/netinst.wml: 1.14 -> 1.15 
english/releases/etch/Makefile: 1.6 -> 1.7 
english/releases/etch/release.data: 1.29 -> 1.30 
english/releases/etch/debian-installer/index.wml: 1.25 -> 1.26 
english/releases/lenny/Makefile: 1.4 -> 1.5 
english/releases/lenny/release.data: 1.16 -> 1.17 
english/releases/lenny/debian-installer/index.wml: 1.14 -> 1.15 
english/releases/sarge/Makefile: 1.10 -> 1.11 
english/template/debian/installer.wml: 1.13 -> 1.14 
english/template/debian/release_images.wml: 1.9 -> 1.10

3 files changed, 21 insertions, 18 deletions

diff --git a/english/releases/etch/Makefile b/english/releases/etch/Makefile
index b119965aad2..276f2fcdd96 100644
--- a/english/releases/etch/Makefile
+++ b/english/releases/etch/Makefile
@@ -20,3 +20,6 @@ installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \
 
 etchnhalf.$(LANGUAGE).html: etchnhalf.wml $(TEMPLDIR)/release.wml \
   $(ENGLISHDIR)/releases/etch/release.data
+
+$(ENGLISHSRCDIR)/$(CUR_DIR)/release.data: $(TEMPLDIR)/installer.wml
+	touch $@
diff --git a/english/releases/etch/debian-installer/index.wml b/english/releases/etch/debian-installer/index.wml
index e6c7a2357c4..77543810a7b 100644
--- a/english/releases/etch/debian-installer/index.wml
+++ b/english/releases/etch/debian-installer/index.wml
@@ -18,31 +18,31 @@ you are recommended to install lenny instead.
 
 <ul>
 	<li>netinst CD image (generally 135-175 MB)<br />
-		<etch-netinst-images />
+		<netinst-images />
 	</li>
 	<li>businesscard CD image (generally 20-50 MB)<br />
-		<etch-businesscard-images />
+		<businesscard-images />
 	</li>
 	<li>full CD/DVD sets<br />
             <table cellpadding="0" cellspacing="0">
-                <tr><td>CD:&nbsp;</td><td><etch-full-cd-images /></td></tr>
-                <tr><td>DVD:&nbsp;</td><td><etch-full-dvd-images /></td></tr>
+                <tr><td>CD:&nbsp;</td><td><full-cd-images /></td></tr>
+                <tr><td>DVD:&nbsp;</td><td><full-dvd-images /></td></tr>
             </table>
 	</li>
         <li>full CD/DVD sets (via <a href="$(HOME)/CD/torrent-cd">bittorrent</a>)
             <table cellpadding="0" cellspacing="0">
-                <tr><td>CD:&nbsp;</td><td><etch-full-cd-torrent /></td></tr>
-                <tr><td>DVD:&nbsp;</td><td><etch-full-dvd-torrent /></td></tr>
+                <tr><td>CD:&nbsp;</td><td><full-cd-torrent /></td></tr>
+                <tr><td>DVD:&nbsp;</td><td><full-dvd-torrent /></td></tr>
             </table>
         </li>
         <li>full CD/DVD sets (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)
             <table cellpadding="0" cellspacing="0">
-                <tr><td>CD:&nbsp;</td><td><etch-full-cd-jigdo /></td></tr>
-                <tr><td>DVD:&nbsp;</td><td><etch-full-dvd-jigdo /></td></tr>
+                <tr><td>CD:&nbsp;</td><td><full-cd-jigdo /></td></tr>
+                <tr><td>DVD:&nbsp;</td><td><full-dvd-jigdo /></td></tr>
             </table>
         </li>
         <li>other images (netboot, usb stick, floppy, etc)<br />
-            <etch-other-images />
+            <other-images />
         </li>
 </ul>
 
diff --git a/english/releases/etch/release.data b/english/releases/etch/release.data
index 31f953676ac..ced928453f2 100644
--- a/english/releases/etch/release.data
+++ b/english/releases/etch/release.data
@@ -90,38 +90,38 @@
 
 <define-tag etch-images-url>http://cdimage.debian.org/cdimage/archive/4.0_r7</define-tag>
 
-<define-tag etch-netinst-images>
+<define-tag netinst-images>
 <images-list url="<etch-images-url/>/@ARCH@/iso-cd/debian-40r7-@ARCH@-netinst.iso" arch="<strip-arches <etch-images-arches/> "s390 source" />" />
 </define-tag>
 
-<define-tag etch-businesscard-images>
+<define-tag businesscard-images>
 <images-list url="<etch-images-url/>/@ARCH@/iso-cd/debian-40r7-@ARCH@-businesscard.iso" arch="<strip-arches <etch-images-arches/> "s390 source" />" />
 </define-tag>
 
-<define-tag etch-full-cd-images>
+<define-tag full-cd-images>
 <images-list url="<etch-images-url/>/@ARCH@/iso-cd/" arch="<etch-images-arches/>" />
 </define-tag>
 
-<define-tag etch-full-cd-torrent>
+<define-tag full-cd-torrent>
 <images-list url="<etch-images-url/>/@ARCH@/bt-cd/" arch="<etch-images-arches/>" />
 </define-tag>
 
-<define-tag etch-full-cd-jigdo>
+<define-tag full-cd-jigdo>
 <images-list url="<etch-images-url/>/@ARCH@/jigdo-cd/" arch="<etch-images-arches/>" />
 </define-tag>
 
-<define-tag etch-full-dvd-images>
+<define-tag full-dvd-images>
 <images-list url="<etch-images-url/>/@ARCH@/iso-dvd/" arch="<etch-images-arches/>" />
 </define-tag>
 
-<define-tag etch-full-dvd-torrent>
+<define-tag full-dvd-torrent>
 <images-list url="<etch-images-url/>/@ARCH@/bt-dvd/" arch="<etch-images-arches/>" />
 </define-tag>
 
-<define-tag etch-full-dvd-jigdo>
+<define-tag full-dvd-jigdo>
 <images-list url="<etch-images-url/>/@ARCH@/jigdo-dvd/" arch="<etch-images-arches/>" />
 </define-tag>
 
-<define-tag etch-other-images>
+<define-tag other-images>
 <images-list url="http://ftp.debian.org/debian/dists/etch/main/installer-@ARCH@/current/images/" arch="<strip-arches <etch-images-arches/> source />" />
 </define-tag>