Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modify README.html: only attempt to link to the release notes and 

installation manual on release-ready builds, otherwise suggest the
alioth version of the installation manual. Closes: #330398
This commit is contained in:
Steve McIntyre 2009-05-16 20:50:03 +00:00
parent d5479c0814
commit 0c74b3f085
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/squeeze/README.html.in
View File

@ -186,6 +186,7 @@
possible to install and run Debian with only the Binary-1 disc. The other possible to install and run Debian with only the Binary-1 disc. The other
discs, up to Binary-TOTALNUM, contain mostly special-interest programs.</p> discs, up to Binary-TOTALNUM, contain mostly special-interest programs.</p>
# endif # endif
# if (OFFICIAL_VAL == 2)
# if OMIT_RELEASE_NOTES # if OMIT_RELEASE_NOTES
<p>The Release Notes for "squeeze" are available on the <p>The Release Notes for "squeeze" are available on the
<a href="http://www.debian.org/releases/squeeze/releasenotes">Debian web <a href="http://www.debian.org/releases/squeeze/releasenotes">Debian web
@ -203,6 +204,7 @@
# endif # endif
# endif # endif
# endif # endif
# endif
# if TYPEsource # if TYPEsource
This set includes the source code of programs in the Debian OS.</p> This set includes the source code of programs in the Debian OS.</p>
# endif # endif
@ -223,6 +225,7 @@
installation procedure may seem a bit unusual. You can install installation procedure may seem a bit unusual. You can install
Debian GNU/Linux either <em>alongside</em> your current OS, or as Debian GNU/Linux either <em>alongside</em> your current OS, or as
the <em>only</em> OS on your computer.</p> the <em>only</em> OS on your computer.</p>
# if (OFFICIAL_VAL == 2)
# if OMIT_MANUAL # if OMIT_MANUAL
<p>An <b>Installation Guide</b> for this disc is available from <p>An <b>Installation Guide</b> for this disc is available from
<a href="http://www.debian.org/releases/squeeze/installmanual">the <a href="http://www.debian.org/releases/squeeze/installmanual">the
@ -241,7 +244,15 @@
<a href="http://www.debian.org/releases/squeeze/installmanual">the Debian web site</a>. <a href="http://www.debian.org/releases/squeeze/installmanual">the Debian web site</a>.
</p> </p>
# endif # endif
# else
<p>As this is not an official squeeze release disc, then the
installation guide many not be released yet. It will appear on <a
href="http://www.debian.org/releases/squeeze/installmanual">the
Debian web site</a> when ready, but before then you could try <a
href="http://d-i.alioth.debian.org/manual/">the development
version of the manual</a>.
</p> </p>
# endif
# if ARCHi386 || ARCHamd64 || ARCHia64 || ARCHalpha || ARCHpowerpc || ARCHsparc # if ARCHi386 || ARCHamd64 || ARCHia64 || ARCHalpha || ARCHpowerpc || ARCHsparc
<p>For the impatient ones: you can start the installation program easily by <p>For the impatient ones: you can start the installation program easily by

3
debian/changelog vendored
View File

@ -25,6 +25,9 @@ debian-cd (3.1.2) UNRELEASED; urgency=low
* Recognise and ignore Breaks: lines. Closes: #523444 * Recognise and ignore Breaks: lines. Closes: #523444
* Re-add code to generate install.bat on x86 machines. Thanks to Samuel * Re-add code to generate install.bat on x86 machines. Thanks to Samuel
Thibault for the patch. Closes: #518807 Thibault for the patch. Closes: #518807
* Modify README.html: only attempt to link to the release notes and
installation manual on release-ready builds, otherwise suggest the
alioth version of the installation manual. Closes: #330398
-- Frans Pop <fjp@debian.org> Sun, 15 Feb 2009 23:41:25 +0100 -- Frans Pop <fjp@debian.org> Sun, 15 Feb 2009 23:41:25 +0100