Merge remote-tracking branch 'upstream/debian/sid' into debian/sid

[apt.git] / doc / guide.sgml

diff --git a/doc/guide.sgml b/doc/guide.sgml
index ff727f6cac82662151c7ff7bbfe1a37415beb00e..747c5718cb627d20bfd9b017cfd446862d8c5018 100644 (file)
--- 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>
 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>
 
 /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
 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
 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
 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>
 downloading from the Internet.
 
 <p>