From 6cbb88de9417ce776e3488cf3495eb8fed3efe0c Mon Sep 17 00:00:00 2001 From: Justin B Rye Date: Tue, 29 May 2012 15:39:41 +0200 Subject: * doc/apt-get.8.xml: - move dselect-upgrade below dist-upgrade --- doc/apt-get.8.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 620d22106..ce68fcc63 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -70,16 +70,6 @@ available. - - dselect-upgrade - is used in conjunction with the traditional Debian packaging - front-end, &dselect;. dselect-upgrade - follows the changes made by &dselect; to the Status - field of available packages, and performs the actions necessary to realize - that state (for instance, the removal of old and the installation of new - packages). - - dist-upgrade in addition to performing the function of upgrade, also intelligently handles changing dependencies @@ -93,6 +83,16 @@ overriding the general settings for individual packages. + + dselect-upgrade + is used in conjunction with the traditional Debian packaging + front-end, &dselect;. dselect-upgrade + follows the changes made by &dselect; to the Status + field of available packages, and performs the actions necessary to realize + that state (for instance, the removal of old and the installation of new + packages). + + install is followed by one or more -- cgit v1.2.3 From 6c1965bd8db56c5a6bd96c2ce6ef3afd3c3f3daf Mon Sep 17 00:00:00 2001 From: Justin B Rye Date: Tue, 29 May 2012 15:57:01 +0200 Subject: Reword: "So, dist-upgrade command may remove some packages." to "The dist-upgrade command may therefore remove some packages." --- doc/apt-get.8.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/apt-get.8.xml') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index ce68fcc63..48e8d4122 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -76,7 +76,7 @@ with new versions of packages; apt-get has a "smart" conflict resolution system, and it will attempt to upgrade the most important packages at the expense of less important ones if necessary. - So, dist-upgrade command may remove some packages. + The dist-upgrade command may therefore remove some packages. The /etc/apt/sources.list file contains a list of locations from which to retrieve desired package files. See also &apt-preferences; for a mechanism for -- cgit v1.2.3 From 5583d4146c513283590a1f2d73975a4e667b523a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 29 May 2012 16:14:25 +0200 Subject: * doc/apt-get.8.xml: - use apt-utils as package example instead of libc6 --- doc/apt-get.8.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 48e8d4122..a05a441a4 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -99,8 +99,8 @@ packages desired for installation or upgrading. Each package is a package name, not a fully qualified filename (for instance, in a Debian system, - libc6 would be the argument provided, not - libc6_1.9.6-2.deb). All packages required + apt-utils would be the argument provided, not + apt-utils_&apt-product-version;_amd64.deb). All packages required by the package(s) specified for installation will also be retrieved and installed. The /etc/apt/sources.list file is -- cgit v1.2.3 From 2ad3eaf6a63334091367f963544a2ac508a28593 Mon Sep 17 00:00:00 2001 From: Justin B Rye Date: Sat, 2 Jun 2012 18:03:45 +0200 Subject: * doc/apt-get.8.xml: - review and fix spelling issues --- doc/apt-get.8.xml | 77 +++++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 39 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index a05a441a4..5fef807e2 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -149,8 +149,8 @@ remove is identical to install except that packages are - removed instead of installed. Note the removing a package leaves its - configuration files in system. If a plus sign is appended to the package + removed instead of installed. Note that removing a package leaves its + configuration files on the system. If a plus sign is appended to the package name (with no intervening space), the identified package will be installed instead of removed. @@ -170,11 +170,10 @@ pkg/release syntax, if possible. Source packages are tracked separately - from binary packages via deb-src type lines + from binary packages via deb-src lines in the &sources-list; file. This means that you will need to add such a line - for each repository you want to get sources from. If you don't do this - you will properly get another (newer, older or none) source version than - the one you have installed or could install. + for each repository you want to get sources from; otherwise you will probably + get either the wrong (too old/too new) source versions or none at all. If the option is specified then the package will be compiled to a binary .deb using @@ -188,10 +187,10 @@ used for the package files. This enables exact matching of the source package name and version, implicitly enabling the APT::Get::Only-Source option. - - Note that source packages are not tracked like binary packages, they - exist only in the current directory and are similar to downloading source - tar balls. + + Note that source packages are not installed and tracked in the + dpkg database like binary packages; they are simply downloaded + to the current directory, like source tarballs. @@ -241,7 +240,7 @@ changelog downloads a package changelog and displays it through sensible-pager. The server name and base directory is defined in the APT::Changelogs::Server - variable (e. g. packages.debian.org/changelogs for + variable (e.g. packages.debian.org/changelogs for Debian or changelogs.ubuntu.com/changelogs for Ubuntu). By default it displays the changelog for the version that is @@ -291,7 +290,7 @@ - Ignore missing packages; If packages cannot be retrieved or fail the + Ignore missing packages; if packages cannot be retrieved or fail the integrity check after retrieval (corrupted package files), hold back those packages and handle the result. Use of this option together with may produce an error in some situations. If a package is @@ -312,9 +311,9 @@ Quiet; produces output suitable for logging, omitting progress indicators. More q's will produce more quiet up to a maximum of 2. You can also use to set the quiet level, overriding the configuration file. - Note that quiet level 2 implies , you should never use -qq + Note that quiet level 2 implies ; you should never use -qq without a no-action modifier such as -d, --print-uris or -s as APT may - decided to do something you did not expect. + decide to do something you did not expect. Configuration Item: quiet. @@ -328,17 +327,18 @@ actually change the system. Configuration Item: APT::Get::Simulate. - Simulation run as user will deactivate locking (Debug::NoLocking) - automatic. Also a notice will be displayed indicating that this is only a simulation, - if the option APT::Get::Show-User-Simulation-Note is set (Default: true). - Neither NoLocking nor the notice will be triggered if run as root (root should know what - he is doing without further warnings by apt-get). + Simulated runs performed as a user will automatically deactivate locking + (Debug::NoLocking), and if the option + APT::Get::Show-User-Simulation-Note is set + (as it is by default) a notice will also be displayed indicating that + this is only a simulation. Runs performed as root do not trigger either + NoLocking or the notice - superusers should know what they are doing + without further warnings from apt-get. - Simulate prints out - a series of lines each one representing a dpkg operation, Configure (Conf), - Remove (Remv), Unpack (Inst). Square brackets indicate broken packages - and empty set of square brackets meaning breaks that are of no consequence - (rare). + Simulated runs print out a series of lines, each representing a dpkg + operation: configure (Conf), remove (Remv) + or unpack (Inst). Square brackets indicate broken packages, and + empty square brackets indicate breaks that are of no consequence (rare). @@ -356,7 +356,7 @@ - Show upgraded packages; Print out a list of all packages that are to be + Show upgraded packages; print out a list of all packages that are to be upgraded. Configuration Item: APT::Get::Show-Upgraded. @@ -383,21 +383,21 @@ - Ignore package Holds; This causes apt-get to ignore a hold + Ignore package holds; this causes apt-get to ignore a hold placed on a package. This may be useful in conjunction with dist-upgrade to override a large number of undesired holds. Configuration Item: APT::Ignore-Hold. - Do not upgrade packages; When used in conjunction with install, + Do not upgrade packages; when used in conjunction with install, no-upgrade will prevent packages on the command line from being upgraded if they are already installed. Configuration Item: APT::Get::Upgrade. - Do not install new packages; When used in conjunction + Do not install new packages; when used in conjunction with install, only-upgrade will install upgrades for already installed packages only and ignore requests to install new packages. @@ -405,7 +405,7 @@ - Force yes; This is a dangerous option that will cause apt to continue + Force yes; this is a dangerous option that will cause apt to continue without prompting if it is doing something potentially harmful. It should not be used except in very special situations. Using force-yes can potentially destroy your system! @@ -415,7 +415,7 @@ Instead of fetching the files to install their URIs are printed. Each URI will have the path, the destination file name, the size and the expected - md5 hash. Note that the file name to write to will not always match + MD5 hash. Note that the file name to write to will not always match the file name on the remote site! This also works with the source and update commands. When used with the update command the MD5 and size are not included, and it is @@ -432,23 +432,22 @@ - Re-Install packages that are already installed and at the newest version. + Re-install packages that are already installed and at the newest version. Configuration Item: APT::Get::ReInstall. - This option defaults to on, use --no-list-cleanup to turn it - off. When on apt-get will automatically manage the contents of - &statedir;/lists to ensure that obsolete files are erased. - The only reason to turn it off is if you frequently change your source - list. + This option is on by default; use --no-list-cleanup to turn + it off. When it is on, apt-get will automatically manage the contents + of &statedir;/lists to ensure that obsolete files are erased. + The only reason to turn it off is if you frequently change your sources list. Configuration Item: APT::Get::List-Cleanup. - This option controls the default input to the policy engine, it creates + This option controls the default input to the policy engine; it creates a default pin at priority 990 using the specified release string. This overrides the general settings in /etc/apt/preferences. Specifically pinned packages are not affected by the value @@ -464,7 +463,7 @@ Only perform operations that are 'trivial'. Logically this can be considered - related to , where will answer + related to ; where will answer yes to any prompt, will answer no. Configuration Item: APT::Get::Trivial-Only. @@ -477,7 +476,7 @@ If the command is either install or remove, - then this option acts like running autoremove command, removing the unused + then this option acts like running the autoremove command, removing unused dependency packages. Configuration Item: APT::Get::AutomaticRemove. -- cgit v1.2.3 From dabb215cb8c4b074d286737da523d8ef14381468 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 9 Jun 2012 22:05:55 +0200 Subject: updating tags and the po files for the manpages --- doc/apt-get.8.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/apt-get.8.xml') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 5fef807e2..cc4e82255 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -18,7 +18,7 @@ &apt-email; &apt-product; - 2012-05-21T00:00:00Z + 2012-06-09T00:00:00Z -- cgit v1.2.3