diff options
| author | Samuel Thibault <sthibault@debian.org> | 2012-08-26 18:33:25 +0000 |
|---|---|---|
| committer | Samuel Thibault <sthibault@debian.org> | 2012-08-26 18:33:25 +0000 |
| commit | 52f8c44aa6f1e490e38a3c82bc2f0a30a0cf5826 (patch) | |
| tree | 1811da57c7a936143adecc32e7c58a85c66fc42d | |
| parent | b574e76a9e62abb54d735be44bfebc4955a083f4 (diff) | |
| download | installation-guide-52f8c44aa6f1e490e38a3c82bc2f0a30a0cf5826.zip | |
* official-cdrom: Add link to CD FaQ. Thanks Holger Wansing and Richard
Owlett for the heads-up. Closes: #280348.
| -rw-r--r-- | build/entities/urls.ent | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | en/install-methods/official-cdrom.xml | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/build/entities/urls.ent b/build/entities/urls.ent index 7648e6d7e..05bc100f3 100644 --- a/build/entities/urls.ent +++ b/build/entities/urls.ent @@ -71,6 +71,9 @@ <!-- General Debian CD pages --> <!ENTITY url-debian-cd "http://&www-debian-org;/CD/"> +<!-- Debian CD FAQ --> +<!ENTITY url-debian-cd-faq "http://&www-debian-org;/CD/faq/"> + <!-- vendors that sell Debian CDs --> <!ENTITY url-debian-cd-vendors "http://&www-debian-org;/CD/vendors/"> diff --git a/debian/changelog b/debian/changelog index ca76da8a9..6714b3856 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ installation-guide (20120827) UNRELEASED; urgency=low * debian/rules: Fix suite name. * preseed: Add authorized_keys url preseed example, thanks Charles Plessy for the patch. Closes: #684629. + * official-cdrom: Add link to CD FaQ. Thanks Holger Wansing and Richard + Owlett for the heads-up. Closes: #280348. -- Samuel Thibault <sthibault@debian.org> Sun, 26 Aug 2012 16:47:22 +0200 diff --git a/en/install-methods/official-cdrom.xml b/en/install-methods/official-cdrom.xml index f48e29e39..06742be4c 100644 --- a/en/install-methods/official-cdrom.xml +++ b/en/install-methods/official-cdrom.xml @@ -10,7 +10,8 @@ By far the easiest way to install &debian-gnu; is from an Official <ulink url="&url-debian-cd-vendors;">CD vendors page</ulink>). You may also download the CD-ROM images from a &debian; mirror and make your own set, if you have a fast network connection and a CD burner -(see the <ulink url="&url-debian-cd;">Debian CD page</ulink> for +(see the <ulink url="&url-debian-cd;">Debian CD page</ulink> and +<ulink url="&url-debian-cd-faq;">Debian CD FAQ</ulink> for detailed instructions). If you have a &debian; CD set and CDs are bootable on your machine, you can skip right to <xref linkend="boot-installer"/>; much effort has been expended to ensure |