diff options
| author | Joey Hess <joeyh> | 2007-03-20 20:05:18 +0000 |
|---|---|---|
| committer | Joey Hess <joeyh> | 2007-03-20 20:05:18 +0000 |
| commit | a4e6ffc93c284d83fbcc435ffae37e53fc2fb31e (patch) | |
| tree | a8de8d6b870c5fc25d7436ef9ba1965a5b63f024 /english/CD/jigdo-cd | |
| parent | 5e5eec398ae688fe2b9d45e4f5b66a94394ec622 (diff) | |
Updates for etch release. Avoid hardcoding CD image stuff in these files,
now using tags from both images.data files instead.
CVS version numbers
english/CD/faq/index.wml: 1.72 -> 1.73
english/CD/http-ftp/index.wml: 1.33 -> 1.34
english/CD/jigdo-cd/Makefile: 1.5 -> 1.6
english/CD/jigdo-cd/index.wml: 1.65 -> 1.66
english/CD/netinst/Makefile: 1.4 -> 1.5
english/CD/netinst/index.wml: 1.49 -> 1.50
english/CD/torrent-cd/Makefile: 1.4 -> 1.5
english/CD/torrent-cd/index.wml: 1.14 -> 1.15
Diffstat (limited to 'english/CD/jigdo-cd')
| -rw-r--r-- | english/CD/jigdo-cd/Makefile | 4 | ||||
| -rw-r--r-- | english/CD/jigdo-cd/index.wml | 24 |
2 files changed, 23 insertions, 5 deletions
diff --git a/english/CD/jigdo-cd/Makefile b/english/CD/jigdo-cd/Makefile index 7eaaf74aab4..2866c6aa962 100644 --- a/english/CD/jigdo-cd/Makefile +++ b/english/CD/jigdo-cd/Makefile @@ -10,4 +10,6 @@ include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/cdimage.wml \ $(TEMPLDIR)/installer.wml $(TEMPLDIR)/toc.wml \ - $(ENGLISHSRCDIR)/releases/info + $(ENGLISHSRCDIR)/releases/info \ + $(ENGLISHSRCDIR)/devel/debian-installer/images.data \ + $(ENGLISHSRCDIR)/releases/images.data diff --git a/english/CD/jigdo-cd/index.wml b/english/CD/jigdo-cd/index.wml index 8ddadef3825..6aed3d49969 100644 --- a/english/CD/jigdo-cd/index.wml +++ b/english/CD/jigdo-cd/index.wml @@ -2,6 +2,8 @@ #use wml::debian::toc #use wml::debian::installer #include "$(ENGLISHDIR)/releases/info" +#include "$(ENGLISHDIR)/releases/images.data" +#include "$(ENGLISHDIR)/devel/debian-installer/images.data" <p>Jigsaw Download, or short <a href="http://atterer.net/jigdo/">jigdo</a>, is intended to be the main way of distributing Debian CD images in the @@ -94,6 +96,7 @@ about the installation process</a>.</p> <ul> +<if-stable-release release="sarge"> <li>Official jigdo files for the "stable" release on CD:<br> <images-list url="http://cdimage.debian.org/debian-cd/current/@ARCH@/jigdo-cd/" /> </li> @@ -101,9 +104,20 @@ about the installation process</a>.</p> <li>Official jigdo files for the "stable" release on DVD:<br> <images-list url="http://cdimage.debian.org/debian-cd/current/@ARCH@/jigdo-dvd/" /> </li> +</if-stable-release> +<if-stable-release release="etch"> + <li>Official jigdo files for the "stable" release on CD:<br> + <etch-full-cd-jigdo /> + </li> + + <li>Official jigdo files for the "stable" release on DVD:<br> + <etch-full-dvd-jigdo /> + </li> +</if-stable-release> </ul> +<if-stable-release release="sarge"> <ul> <li>Jigdo files for the unofficial <a href="$(HOME)/ports/amd64/">AMD64</a> stable release: @@ -111,12 +125,14 @@ about the installation process</a>.</p> [<a href="http://cdimage.debian.org/cdimage/unofficial/sarge-amd64/jigdo-dvd/">DVD</a>] </li> </ul> +</if-stable-release> <ul> - <li>Official jigdo files for the - <a href="http://cdimage.debian.org/cdimage/weekly-builds/">"testing" - distribution</a> on CD and DVD - (<em>all architectures, regenerated weekly</em>) + <li>Official jigdo files for the "testing" distribution on CD:<br> + <full-cd-jigdo /> + </li> + <li>Official jigdo files for the "testing" distribution on DVD:<br> + <full-dvd-jigdo /> </li> </ul> |