From 99fc3e085d83f14f983172fa6936b11a535df57e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 3 Oct 2008 20:41:16 +0200 Subject: * Better documentation on using both APT::Default-Release and /etc/apt/preferences (closes: #145575) --- doc/apt-get.8.xml | 6 ++++-- 1 file changed, 4 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 329a46c51..2ea6ea1d4 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -371,8 +371,10 @@ This option controls the default input to the policy engine, it creates - a default pin at priority 990 using the specified release string. The - preferences file may further override this setting. In short, this option + 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 + of this option. In short, this option lets you have simple control over which distribution packages will be retrieved from. Some common examples might be or . -- cgit v1.2.3-70-g09d2 From 77c9def7e8caf13bb1630bc4e3bdc4f2c1853dd4 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 13:19:15 +0200 Subject: Clearly documented '/' and '=' in apt-get.8. --- debian/changelog | 9 +++++---- doc/apt-get.8.xml | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 9 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index ceb5efbdc..da540872e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,12 +35,13 @@ apt (0.7.17) unstable; urgency=low - Lowercased short package descriptions. - Bumped 'Standards-Version' to 3.8.0, no changes needed. * cmdline/apt-cache.cc: - - Advanced built-in help. Patch by - Andre Felipe Machado . (Closes: #286061) + - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) * doc/: - Substituded 'apt-archive' with 'apt-ftparchive' in docs. - Patch based on work of - Andre Felipe Machado . (Closes: #350865) + Patch based on work of Andre Felipe Machado. (Closes: #350865) + - Mentioned '/' and '=' for 'apt-get install' and + '=' for 'apt-get source'. Patch based on work of Andre Felipe + Machado. (Closes: #399673) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 2ea6ea1d4..7dc2fedb9 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 29 February 2004 + 28 October 2008 @@ -40,10 +40,30 @@ update upgrade dselect-upgrade - install pkg + install + pkg + + + =pkg_version_number + + + /target_release_name + + + + remove pkg purge pkg - source pkg + + source + pkg + + + =pkg_version_number + + + + build-dep pkg check clean @@ -495,7 +515,14 @@ Diagnostics apt-get returns zero on normal operation, decimal 100 on error. - + + ORIGINAL AUTHORS + &apt-author.jgunthorpe; + + + CURRENT AUTHORS + &apt-author.team; + &apt-qapage; + &manbugs; - -- cgit v1.2.3-70-g09d2 From 7e4c7441e83fc2cf37436d0d22b9004392759ec0 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 13:42:09 +0200 Subject: Mentioned more short options in the apt-get's manpage. Documented 'xvcg' in the apt-get manpage. --- debian/changelog | 3 +++ doc/apt-cache.8.xml | 6 ++++++ doc/apt-get.8.xml | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 41 insertions(+), 4 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index da540872e..69f1500fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,9 @@ apt (0.7.17) unstable; urgency=low - Mentioned '/' and '=' for 'apt-get install' and '=' for 'apt-get source'. Patch based on work of Andre Felipe Machado. (Closes: #399673) + - Mentioned more short options in the apt-get manpage. Documented 'xvcg' + option in the apt-cache manpage. The part of patch by Andre Felipe + Machado. (Closes: #176106) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 6416f4edf..520c3cdca 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -51,6 +51,7 @@ rdepends pkg pkgnames prefix dotty pkg + xvcg pkg policy pkgs madison pkgs @@ -241,6 +242,11 @@ Reverse Provides: To limit the output to only the packages listed on the command line, set the APT::Cache::GivenOnly option. + xvcg pkg(s) + The same as dotty, only for xvcg from the + VCG tool. + + The resulting nodes will have several shapes; normal packages are boxes, pure provides are triangles, mixed provides are diamonds, missing packages are hexagons. Orange boxes mean recursion was stopped diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 7dc2fedb9..f0c740cd2 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 28 October 2008 + 30 October 2008 @@ -33,9 +33,37 @@ apt-get - - - + + + + + + + + + + + update upgrade -- cgit v1.2.3-70-g09d2 From 2b0de496a89d9ba180853484fe55b0e437ab7059 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 13:53:30 +0200 Subject: Advanced documentation for 'apt-get install' command, mentioned upgrading possibility. --- debian/changelog | 3 +++ doc/apt-get.8.xml | 41 ++++++++++++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 11 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index 69f1500fc..271f8a6f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,9 @@ apt (0.7.17) unstable; urgency=low - Mentioned more short options in the apt-get manpage. Documented 'xvcg' option in the apt-cache manpage. The part of patch by Andre Felipe Machado. (Closes: #176106) + - Documented that 'apt-get install' command should be used for upgrading + some of installed packages. Based on patch by Nori Heikkinen and + Andre Felipe Machado. (Closes: #267087) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index f0c740cd2..fdf3e00ed 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -159,17 +159,25 @@ install - install is followed by one or more packages desired for - installation. Each package is a package name, not a fully qualified - filename (for instance, in a Debian GNU/Linux system, libc6 would be the - argument provided, not libc6_1.9.6-2.deb) All packages required - by the package(s) specified for installation will also be retrieved and - installed. The /etc/apt/sources.list file is used to locate - the desired packages. If a hyphen is appended to the package name (with - no intervening space), the identified package will be removed if it is - installed. Similarly a plus sign can be used to designate a package to - install. These latter features may be used to override decisions made by - apt-get's conflict resolution system. + + + install is followed by one or more + packages desired for installation or upgrading. + Each package is a package name, not a fully qualified + filename (for instance, in a Debian GNU/Linux system, + libc6 would be the argument provided, not + libc6_1.9.6-2.deb). All packages required + by the package(s) specified for installation will also + be retrieved and installed. + The /etc/apt/sources.list file is + used to locate the desired packages. If a hyphen is + appended to the package name (with no intervening space), + the identified package will be removed if it is installed. + Similarly a plus sign can be used to designate a + package to install. These latter features may be used + to override decisions made by apt-get's conflict + resolution system. + A specific version of a package can be selected for installation by following the package name with an equals and the version of the package @@ -181,6 +189,17 @@ Both of the version selection mechanisms can downgrade packages and must be used with care. + This is also the target to use if you want to upgrade one or + more already-installed packages without upgrading every package + you have on your system. Unlike the "upgrade" target, which + installs the newest version of all currently installed packages, + "install" will install the newest version of only the package(s) + specified. Simply provide the name of the package(s) you wish + to upgrade, and if a newer version is available, it (and its + dependencies, as described above) will be downloaded and + installed. + + Finally, the &apt-preferences; mechanism allows you to create an alternative installation policy for individual packages. -- cgit v1.2.3-70-g09d2 From ef48e3ae39501a416274e55067412e5d6048fa43 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 14:35:17 +0200 Subject: Removed unneeded . --- doc/apt-get.8.xml | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index fdf3e00ed..40027b9f0 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -69,29 +69,28 @@ upgrade dselect-upgrade install - pkg - - - =pkg_version_number - - - /target_release_name - - - - + pkg + + + =pkg_version_number + + + /target_release_name + + + + remove pkg purge pkg - source - pkg - - - =pkg_version_number - - - - + pkg + + + =pkg_version_number + + + + build-dep pkg check clean -- cgit v1.2.3-70-g09d2 From 4a09fd30563425de225a33974e9522c8e8e09553 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 16:15:25 +0200 Subject: Fixed validation of apt-get.8.xml --- doc/apt-get.8.xml | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 40027b9f0..817ebe1b0 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -36,14 +36,7 @@ @@ -52,16 +45,15 @@ - + + + + target_release_name + + + target_release_number_expression + + @@ -563,12 +555,14 @@ ORIGINAL AUTHORS - &apt-author.jgunthorpe; + &apt-author.jgunthorpe; - + CURRENT AUTHORS - &apt-author.team; - &apt-qapage; - + + &apt-author.team; + &apt-qapage; + + &manbugs; -- cgit v1.2.3-70-g09d2 From 060d44030cddd071cf7cd6923645de4f2bffd454 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 16:41:24 +0200 Subject: Corrected synopsis part for 'apt-get' source. --- doc/apt-get.8.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 817ebe1b0..9e6c01de4 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -76,11 +76,9 @@ purge pkg source pkg - - - =pkg_version_number - - + + =pkg_version_number + build-dep pkg -- cgit v1.2.3-70-g09d2 From 763f954953478df8afb78a19fa007e5d7f5c80c9 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 12:38:08 +0200 Subject: Typo fix. --- 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 9e6c01de4..73ad09c62 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -506,7 +506,7 @@ /etc/apt/apt.conf.d/ - APT configuration file fragments + APT configuration file fragments. Configuration Item: Dir::Etc::Parts. -- cgit v1.2.3-70-g09d2 From d914c3b7f836ec6dc2e74e98720c4a16e6ea258e Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 12:49:16 +0200 Subject: Documented '--no-install-recommends' in apt-get manpage. --- debian/changelog | 2 ++ doc/apt-get.8.xml | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index 529e0a337..007239c6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,8 @@ apt (0.7.17) unstable; urgency=low configure-index example. (Closes: #463268) - Added 'APT::Get::AllowUnauthenticated' to configure-index. (Closes: #320225) + - Documented '--no-install-recommends' option in apt-get manpage. + (Closes: #462962) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 73ad09c62..75fda1320 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -278,6 +278,11 @@ &apt-cmdblurb; + + Do not consider recommended packages as a dependency for installing. + Configuration Item: APT::Install-Recommends. + + Download only; package files are only retrieved, not unpacked or installed. Configuration Item: APT::Get::Download-Only. -- cgit v1.2.3-70-g09d2 From 78482e30ed7d898a05023bf77beb3d46eb06d544 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 15:00:29 +0200 Subject: Another fix for synopsis of 'apt-get install'. --- doc/apt-get.8.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 75fda1320..797a6562e 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -62,14 +62,16 @@ dselect-upgrade install pkg - - - =pkg_version_number - - - /target_release_name - - + + + + =pkg_version_number + + + /target_release_name + + + remove pkg -- cgit v1.2.3-70-g09d2 From fc91816f90f5229170f487b0ce3e300f133525e9 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 15:02:58 +0200 Subject: Another fix for 'apt-get <...> -t' synopsis. --- 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 797a6562e..a69fbcd48 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -48,10 +48,10 @@ - target_release_name + target_release_name - target_release_number_expression + target_release_number_expression -- cgit v1.2.3-70-g09d2 From c74e6100c542c456340d241fd907d7f5fc10c98f Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 15:10:21 +0200 Subject: Cleaned up unnecessary [<...>] from apt-get synopsis. Added '--help'. --- doc/apt-get.8.xml | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index a69fbcd48..c63011b2a 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -33,7 +33,7 @@ apt-get - + - update - upgrade - dselect-upgrade - install + update + upgrade + dselect-upgrade + install pkg @@ -74,20 +74,26 @@ - remove pkg - purge pkg - source + remove pkg + purge pkg + source pkg =pkg_version_number - build-dep pkg - check - clean - autoclean - autoremove + build-dep pkg + check + clean + autoclean + autoremove + + + -h + --help + + -- cgit v1.2.3-70-g09d2 From 007aba926a1f2fd17952ba9052fbb739f7a0077c Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 5 Nov 2008 23:19:28 +0200 Subject: Added (x) to some manpage referrings in apt-get manpage. --- debian/changelog | 7 ++++++- doc/apt-get.8.xml | 6 +++--- doc/apt.ent | 14 +++++++++++++- 3 files changed, 22 insertions(+), 5 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index 5775003d3..4648efe55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -79,7 +79,12 @@ apt (0.7.17) unstable; urgency=low - clarify whether configuration items of apt.conf are case-sensitive (thanks to Vincent McIntyre, closes: #345901) - -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 + [ Eugene V. Lyubimkin ] + * doc/: + - Added '(x)' to some referrings to manpages in apt-get manpage. Patch by + Andre Felipe Machado. (Closes: #309893) + + -- Eugene V. Lyubimkin Wed, 05 Nov 2008 23:16:33 +0200 apt (0.7.16) unstable; urgency=low diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index c63011b2a..f64468052 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 30 October 2008 + 05 November 2008 @@ -101,8 +101,8 @@ Description apt-get is the command-line tool for handling packages, and may be considered the user's "back-end" to other tools using the APT - library. Several "front-end" interfaces exist, such as dselect(8), - aptitude, synaptic, gnome-apt and wajig. + library. Several "front-end" interfaces exist, such as &dselect;, + &aptitude;, &synaptic;, &gnome-apt; and &wajig;. Unless the , or option is given, one of the commands below must be present. diff --git a/doc/apt.ent b/doc/apt.ent index d0bfaba56..6594ba1b3 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -141,7 +141,19 @@ 1 " > - + + + gnome-apt + 1 + " +> + + + wajig + 1 + " +> + -- cgit v1.2.3-70-g09d2 From 2a7f6e97f6a04281dbf6c43ced0cccee3fa2fcfe Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 5 Nov 2008 23:26:04 +0200 Subject: Added 'dist-upgrade' to apt-get synopsis in apt-get manpage. --- debian/changelog | 2 ++ doc/apt-get.8.xml | 1 + 2 files changed, 3 insertions(+) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index 4648efe55..14af5f036 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,8 @@ apt (0.7.17) unstable; urgency=low * doc/: - Added '(x)' to some referrings to manpages in apt-get manpage. Patch by Andre Felipe Machado. (Closes: #309893) + - Added 'dist-upgrade' apt-get synopsis in apt-get manpage. + (Closes: #323866) -- Eugene V. Lyubimkin Wed, 05 Nov 2008 23:16:33 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index f64468052..73bacf09b 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -60,6 +60,7 @@ update upgrade dselect-upgrade + dist-upgrade install pkg -- cgit v1.2.3-70-g09d2 From 861aa1bdf1a895fa8e437abfe992c5d33e5f0fcb Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 23:04:40 +0200 Subject: doc/apt-get.8.xml: advanced descriptions for 'remove' and 'purge'. --- debian/changelog | 3 +++ doc/apt-get.8.xml | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index 9dd22caf4..1f39db3b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ apt (0.7.18) unstable; urgency=low * doc/sources.list.5.xml: - Fixed typo and grammar in 'sources.list.d' section. Thanks to Timothy G Abbott . (Closes: #478098) + * doc/apt-get.8.xml: + - Advanced descriptions for 'remove' and 'purge' options. + (Closes: #274283) -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 73bacf09b..325f1964d 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -213,14 +213,15 @@ remove remove is identical to install except that packages are - removed instead of installed. If a plus sign is appended to the package + removed instead of installed. Note the removing a package leaves its + configuration files in system. If a plus sign is appended to the package name (with no intervening space), the identified package will be installed instead of removed. purge purge is identical to remove except that packages are - removed and purged. + removed and purged (any configuration files are deleted too). source @@ -419,7 +420,8 @@ Use purge instead of remove for anything that would be removed. An asterisk ("*") will be displayed next to packages which are - scheduled to be purged. + scheduled to be purged. is equivalent for + command. Configuration Item: APT::Get::Purge. -- cgit v1.2.3-70-g09d2 From 2f0b4b144b0b7d81fe324091c2902592bbbac005 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 8 Nov 2008 13:02:07 +0200 Subject: Update synopsis in apt-get manpage for '-v'/'--version'. --- debian/changelog | 2 ++ doc/apt-get.8.xml | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index 41093666b..5ff981df6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.19) unstable; urgency=low * doc/sources.list.5.xml: - Mentioned allowed characters in file names in /etc/apt/sources.list.d. Thanks to Matthias Urlichs. (Closes: #426913) + * doc/apt-get.8.xml: + - Included '-v'/'--version' as a command to synopsis. -- Eugene V. Lyubimkin Sat, 08 Nov 2008 12:40:19 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 325f1964d..416fd0384 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 05 November 2008 + 08 November 2008 @@ -33,7 +33,7 @@ apt-get - +