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

[apt.git] / doc / guide.sgml

diff --git a/doc/guide.sgml b/doc/guide.sgml
index dc08574c2b3b17b0f974164347c67987837d791c..747c5718cb627d20bfd9b017cfd446862d8c5018 100644 (file)
--- a/doc/guide.sgml
+++ b/doc/guide.sgml
@@ -4,7 +4,7 @@
 <title>APT User's Guide</title>
 
 <author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: guide.sgml,v 1.5 2002/09/15 23:14:34 jgg Exp $</version>
+<version>$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $</version>
 
 <abstract>
 This document provides an overview of how to use the the APT package manager.
@@ -19,8 +19,8 @@ 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
-/usr/doc/copyright/GPL for the full license.
+For more details, on Debian systems, see the file
+/usr/share/common-licenses/GPL for the full license.
 </copyright>
 
 <toc sect>
@@ -56,7 +56,7 @@ requires another package to be installed at the same time to work properly.
 
 <p>
 For instance, mailcrypt is an emacs extension that aids in encrypting email
-with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a
+with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a
 simple dependency on GPG. Also, because it is an emacs extension it has a 
 simple dependency on emacs, without emacs it is completely useless.
 
@@ -110,7 +110,7 @@ available. This is done with <tt>apt-get update</>. For instance,
 <example>
 # apt-get update
 Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages
-Get http://llug.sep.bnl.gov/debian/ frozen/contrib Packages
+Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages
 Reading Package Lists... Done
 Building Dependency Tree... Done
 </example>
@@ -171,14 +171,14 @@ the <prgn>dselect</> package selection GUI. <prgn>dselect</> is used to
 select the packages to be installed or removed and APT actually installs them.
 
 <p>
-To enable the APT method you need to to select [A]ccess in <prgn>dselect</> 
+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>
@@ -206,7 +206,7 @@ get.
 <example>
  Please give the distribution tag to get or a path to the
  package file ending in a /. The distribution
- tags are typically something like: stable unstable frozen non-US
+ tags are typically something like: stable unstable testing non-US
    
  Distribution [stable]: 
 </example>
@@ -239,7 +239,7 @@ prompt until you have specified all that you want.
 
 <p>
 Before starting to use <prgn>dselect</> it is necessary to update the 
-available list by selecting [U]pdate from the menu. This is a super-set of 
+available list by selecting [U]pdate from the menu. This is a superset of 
 <tt>apt-get update</> that makes the fetched information available to
 <prgn>dselect</>. [U]pdate must be performed even if <tt>apt-get update</>
 has been run before.
@@ -482,11 +482,11 @@ status messages.
 <example>
 # apt-get update
 Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages
-Get:2 http://llug.sep.bnl.gov/debian/ frozen/contrib Packages
-Hit http://llug.sep.bnl.gov/debian/ frozen/main Packages
+Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages
+Hit http://llug.sep.bnl.gov/debian/ testing/main Packages
 Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages
-Get:5 http://llug.sep.bnl.gov/debian/ frozen/non-free Packages
-11% [5 frozen/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s
+Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages
+11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s
 </example>
 
 <p>