summaryrefslogtreecommitdiff
path: root/doc/guide.sgml
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2012-12-26 23:52:47 +0100
committerMichael Vogt <mvo@ubuntu.com>2012-12-26 23:52:47 +0100
commitd2cca6ec46865a1f5167f846e67150dc19ca2022 (patch)
tree43d335f69870a72b97fa41a1b208784b8753d354 /doc/guide.sgml
parent7735ad0500b6fefef03b2a3dc2a6843e82353e94 (diff)
parentd663a4c8a8723ae4936d10d0a98ea2c05a29cbc4 (diff)
merged from the debian-sid branch
Diffstat (limited to 'doc/guide.sgml')
-rw-r--r--doc/guide.sgml8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/guide.sgml b/doc/guide.sgml
index ff727f6ca..747c5718c 100644
--- a/doc/guide.sgml
+++ b/doc/guide.sgml
@@ -19,7 +19,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
@@ -174,11 +174,11 @@ select the packages to be installed or removed and APT actually installs them.
To enable the APT method you need to select [A]ccess in <prgn>dselect</>
and then choose the APT method. You will be prompted for a set of
<em>Sources</> which are places to fetch archives from. These can be remote
-Internet sites, local Debian mirrors or CDROMs. Each source can provide
+Internet sites, local Debian mirrors or CD-ROMs. Each source can provide
a fragment of the total Debian archive, APT will automatically combine them
-to form a complete set of packages. If you have a CDROM then it is a good idea
+to form a complete set of packages. If you have a CD-ROM then it is a good idea
to specify it first and then specify a mirror so that you have access to
-the latest bug fixes. APT will automatically use packages on your CDROM before
+the latest bug fixes. APT will automatically use packages on your CD-ROM before
downloading from the Internet.
<p>