General update the template for the README file; explain the difference between small and full images better

This commit is contained in:
Frans Pop 2007-05-06 23:21:02 +00:00
parent fdb006760d
commit 9a7ab7c7bf
2 changed files with 31 additions and 21 deletions

View File

@ -229,7 +229,7 @@ Intro
</H2>
</a>
<p>
This is one disc in a set containing the the
This is one disc in a set containing the
<a href="http://www.debian.org/">Debian GNU/Linux</a>
distribution. Debian is a
very extensive collection of software. But it is more. It is a complete
@ -293,20 +293,33 @@ This disc is labeled
</tt>
<P>
#ifndef UNOFFEXTRAS
#if COMPLETE
which means that this disc is number DISKNUM of a set of TOTALNUM discs.
#else
This image does not contain all packages needed to install a standard Debian
system. During the installation you will be prompted for the location of a
network mirror from where additional packages will be retrieved.
#endif
#if TYPEbinary
It contains programs ("binaries") for `ARCH' computers.
The packages on this disc contain programs ("binaries") for 'ARCH' computers.
#if ARCHia64 && !ARCHamd64
<P><strong>Note:</strong> this image only supports systems based on
Intel Itanium processors; for the more common Intel EM64T processors,
please see the Debian amd64 architecture.
#endif
<P>
The programs on the Binary discs are ordered by popularity. The Binary-1 disc
#if COMPLETE
The packages on the Binary discs are ordered by popularity. The Binary-1 disc
contains the most popular programs and the installation tools; it is 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>
to install and run Debian with only the Binary-1 disc.
#if TOTALNUM > 1
It is unlikely that you will need all of the TOTALNUM discs in the set. The
higher the number in the set, the less likely it is that you will use any of
the packages on that disc; higher-number images contain mostly special-interest
programs.
#endif
<P>
#endif
#if OMIT_RELEASE_NOTES
The Release Notes for "etch" are available on the <A
href="http://www.debian.org/releases/etch/releasenotes">Debian web
@ -443,7 +456,7 @@ find in the Debian Bug Tracking System; details at <A
HREF="http://bugs.debian.org/">bugs.debian.org</A>.
<LI>If you're reporting bugs against this disc or the installation
system, please also mention the version of this disc; this can be
found in the file <a href="/.disk/info">/.disk/info</a>.
found in the file <a href="./.disk/info">/.disk/info</a>.
#endif
#if OFFICIAL_VAL == 2
<LI>This is an official release of the Debian system. Please report any
@ -451,7 +464,7 @@ bugs you find in the Debian Bug Tracking System; details at <A
HREF="http://bugs.debian.org/">bugs.debian.org</A>.
<LI>If you're reporting bugs against this disc or the installation
system, please also mention the version of this disc; this can be
found in the file <a href="/.disk/info">/.disk/info</a>.
found in the file <a href="./.disk/info">/.disk/info</a>.
#endif
<br>&nbsp;
@ -478,23 +491,23 @@ found in the file <a href="/.disk/info">/.disk/info</a>.
After installing or upgrading, Debian's packaging system can use CDs, DVDs,
local collections, or networked servers (FTP, HTTP) to automatically
install software from (<tt>.deb</tt> <i>packages</i>). This is done
preferably with the `apt' and `aptitude' programs.
preferably with the 'apt' and 'aptitude' programs.
<P>
You can install packages from the commandline using
<tt>apt-get</tt>. For example, if you want to install the packages
`commprog' and `maxgame', you can give the command
<tt>aptitude</tt>. For example, if you want to install the packages
'commprog' and 'maxgame', you can give the command
<P>
<tt>&nbsp;
apt-get install commprog maxgame
aptitude install commprog maxgame
</tt>
<P>
Note that you don't have to enter the complete path, or the
`<tt>.deb</tt>' extension. `Apt' will figure this out itself.
'<tt>.deb</tt>' extension. 'Apt' will figure this out itself.
<P>
Or use aptitude for a full screen interactive selection of available
Debian packages.
Or enter just <tt>aptitude</tt> to interactively select available Debian
packages using a full screen user interface.
#endif
@ -676,11 +689,6 @@ http://www.linux.org
for information on contacting us.
</SMALL><P>
<SMALL>
Last Modified: Sat Mar 20 12:30:45 EST 2004
<br></SMALL>
</DIV>
</td>

4
debian/changelog vendored
View File

@ -21,8 +21,10 @@ debian-cd (3.0.3) UNRELEASED; urgency=high
[ Frans Pop ]
* Dann Frazier has taken over from Jeff Bailey for daily IA64 D-I builds.
* General update the template for the README file; explain the difference
between small and full images better.
-- Frans Pop <fjp@debian.org> Thu, 3 May 2007 23:59:24 +0200
-- Frans Pop <fjp@debian.org> Mon, 7 May 2007 01:18:29 +0200
debian-cd (3.0.2) unstable; urgency=high