From d456bf5a0a30402b7c1aaf13d220f2319f879fe5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 1 Jan 2010 12:54:13 +0100 Subject: [PATCH] Chris Leick spot & fix various typos in all manpages --- debian/changelog | 3 +++ doc/apt.conf.5.xml | 10 +++++----- doc/guide.sgml | 6 +++--- doc/offline.sgml | 8 ++++---- doc/sources.list.5.xml | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f5f25d8e..648d7ed3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.7.26) UNRELEASED; urgency=low [ Christian Perrier ] * French manpage translation update + [Chris Leick] + * spot & fix various typos in all manpages + [ David Kalnischkies ] * [BREAK] add possibility to download and use multiply Translation files, configurable with Acquire::Translation diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 777630e14..734ae1fe7 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -166,10 +166,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; longer guaranteed to work as their dependency on A is not longer satisfied. The immediate configuration marker is also applied to all dependencies which can generate a problem if the dependencies e.g. form a circle as a dependency with the immediate flag is comparable with a Pre-Dependency. So in theory it is possible - that APT encounters a situation in which it is unable to perform immediate configuration, error out and - refers to this option so the user can deactivate the immediate configuration temporary to be able to perform + that APT encounters a situation in which it is unable to perform immediate configuration, errors out and + refers to this option so the user can deactivate the immediate configuration temporarily to be able to perform an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now - in real world a few times in non-stable distribution versions and caused by wrong dependencies of the package + in real world a few times in non-stable distribution versions and was caused by wrong dependencies of the package in question or by a system in an already broken state, so you should not blindly disable this option as the mentioned scenario above is not the only problem immediate configuration can help to prevent in the first place. Before a big operation like dist-upgrade is run with this option disabled it should be tried to @@ -396,7 +396,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Languages The Languages subsection controls which Translation files are downloaded and in which order APT tries to display the Description-Translations. APT will try to display the first - available Description for the Language which is listed at first. Languages can be defined with their + available Description in the Language which is listed at first. Languages can be defined with their short or long Languagecodes. Note that not all archives provide Translation files for every Language - especially the long Languagecodes are rare, so please inform you which ones are available before you set here impossible values. @@ -407,7 +407,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; To force apt to use no Translation file use the setting Acquire::Languages=none. "none" is another special meaning code which will stop the search for a fitting Translation file. This can be used by the system administrator to let APT know that it should download also this files without - actually use them if not the environment specifies this languages. So the following example configuration will + actually use them if the environment doesn't specify this languages. So the following example configuration will result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded, but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en". Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; }; diff --git a/doc/guide.sgml b/doc/guide.sgml index 1b7e1d8f3..ff727f6ca 100644 --- a/doc/guide.sgml +++ b/doc/guide.sgml @@ -56,7 +56,7 @@ requires another package to be installed at the same time to work properly.

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. @@ -171,7 +171,7 @@ the dselect package selection GUI. dselect is used to select the packages to be installed or removed and APT actually installs them.

-To enable the APT method you need to to select [A]ccess in dselect +To enable the APT method you need to select [A]ccess in dselect and then choose the APT method. You will be prompted for a set of Sources which are places to fetch archives from. These can be remote Internet sites, local Debian mirrors or CDROMs. Each source can provide @@ -239,7 +239,7 @@ prompt until you have specified all that you want.

Before starting to use 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 apt-get update that makes the fetched information available to dselect. [U]pdate must be performed even if apt-get update has been run before. diff --git a/doc/offline.sgml b/doc/offline.sgml index 99e260bc3..e7ede14de 100644 --- a/doc/offline.sgml +++ b/doc/offline.sgml @@ -50,7 +50,7 @@ no connection.

This is achieved by creatively manipulating the APT configuration file. The -essential premis to tell APT to look on a disc for it's archive files. Note +essential premise to tell APT to look on a disc for it's archive files. Note that the disc should be formated with a filesystem that can handle long file names such as ext2, fat32 or vfat. @@ -129,7 +129,7 @@ configuration file in /usr/share/doc/apt/examples/apt.conf.

On the target machine the first thing to do is mount the disc and copy /var/lib/dpkg/status to it. You will also need to create the directories -outlined in the Overview, archives/partial/ and lists/partial/ +outlined in the Overview, archives/partial/ and lists/partial/. Then take the disc to the remote machine and configure the sources.list. On the remote machine execute the following: @@ -141,9 +141,9 @@ On the remote machine execute the following: [ APT fetches all the packages needed to upgrade the target machine ] -The dist-upgrade command can be replaced with any-other standard APT commands, +The dist-upgrade command can be replaced with any other standard APT commands, particularly dselect-upgrade. You can even use an APT front end such as -dselect However this presents a problem in communicating your +dselect. However this presents a problem in communicating your selections back to the local computer.

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e2993db2c..c71ae6bdd 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -180,7 +180,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/ APT can be extended with more methods shipped in other optional packages which should follow the nameing scheme apt-transport-method. The APT team e.g. maintains also the apt-transport-https package which - provides access methods for https-URIs with features similiar to the http method, but other + provides access methods for https-URIs with features similar to the http method, but other methods for using e.g. debtorrent are also available, see apt-transport-debtorrent 1. -- 2.47.2