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/netinst | |
| 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/netinst')
| -rw-r--r-- | english/CD/netinst/Makefile | 3 | ||||
| -rw-r--r-- | english/CD/netinst/index.wml | 18 |
2 files changed, 18 insertions, 3 deletions
diff --git a/english/CD/netinst/Makefile b/english/CD/netinst/Makefile index 522ead0e414..a5f00846c5b 100644 --- a/english/CD/netinst/Makefile +++ b/english/CD/netinst/Makefile @@ -9,4 +9,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \ - $(ENGLISHSRCDIR)/releases/info $(TEMPLDIR)/installer.wml + $(ENGLISHSRCDIR)/releases/info $(TEMPLDIR)/installer.wml \ + $(ENGLISHSRCDIR)/releases/images.data diff --git a/english/CD/netinst/index.wml b/english/CD/netinst/index.wml index df8334a90dd..443ead04fd3 100644 --- a/english/CD/netinst/index.wml +++ b/english/CD/netinst/index.wml @@ -1,6 +1,7 @@ #use wml::debian::cdimage title="Network install from a minimal CD" #use wml::debian::installer #include "$(ENGLISHDIR)/releases/info" +#include "$(ENGLISHDIR)/releases/images.data" <p>A <q>network install</q> or <q>netinst</q> CD is a single CD which enables you to install the entire operating system. This single CD contains @@ -65,12 +66,18 @@ small CD-R(W) media, 80 mm/3.1" in diameter. The image contains the installer and a small set of packages which allows the installation of a (very) basic system.</p> -# NOTE: <current-release-{dir,file}name> is defined in -# webwml/english/template/debian/cdimage.wml <ul> +<if-stable-release release="sarge"> + # NOTE: <current-release-{dir,file}name> is defined in + # webwml/english/template/debian/cdimage.wml <li>Sweden: cdimage.debian.org: <images-list url="http://cdimage.debian.org/debian-cd/<current-release-dirname>/@ARCH@/iso-cd/debian-<current-release-filename>-@ARCH@-netinst.iso" arch="<strip-arches "<stable-images-arches />" "s390 source" />" /> </li> +</if-stable-release> +<if-stable-release release="etch"> + <li><etch-small-cd-images /> + </li> +</if-stable-release> </ul> @@ -89,9 +96,16 @@ the installer which are necessary to configure networking and download the rest of the installation system.</p> <ul> +<if-stable-release release="sarge"> <li>Sweden: cdimage.debian.org: <images-list url="http://cdimage.debian.org/debian-cd/<current-release-dirname>/@ARCH@/iso-cd/debian-<current-release-filename>-@ARCH@-businesscard.iso" arch="<strip-arches "<stable-images-arches />" "s390 source" />" /> </li> +</if-stable-release> +<if-stable-release release="etch"> + <li><etch-small-cd-images /> + </li> +</if-stable-release> +</ul> </ul> |