From 2f493cc60cd7b495c0c6739b2c1a04f2e4fb389f Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 12:56:50 +0200 Subject: Substituted 'apt-archive' with 'apt-ftparchive'. --- doc/apt-secure.8.xml | 2 +- doc/apt.ent | 12 +++++++++--- doc/fr/apt-secure.fr.8.xml | 2 +- doc/fr/apt.ent.fr | 4 ++-- doc/ja/apt-secure.ja.8.xml | 2 +- doc/ja/apt.ent.ja | 4 ++-- 6 files changed, 16 insertions(+), 10 deletions(-) (limited to 'doc') diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 01b157789..9696e018d 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -179,7 +179,7 @@ See Also -&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;, +&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, &debsign; &debsig-verify;, &gpg; diff --git a/doc/apt.ent b/doc/apt.ent index b7d03b585..d0bfaba56 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -57,8 +57,8 @@ " > - - apt-archive + + apt-ftparchive 1 " > @@ -148,7 +148,7 @@
apt@packages.debian.org
Jason Gunthorpe 1998-2001 Jason Gunthorpe - 14 December 2003 + 28 October 2008 Linux @@ -207,6 +207,12 @@ Linux "> + + QA Page + +"> + Bugs diff --git a/doc/fr/apt-secure.fr.8.xml b/doc/fr/apt-secure.fr.8.xml index 5cec9a49d..25b5ffd09 100644 --- a/doc/fr/apt-secure.fr.8.xml +++ b/doc/fr/apt-secure.fr.8.xml @@ -188,7 +188,7 @@ les deux premi Voir aussi -&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-archive;, &debsign;, +&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-ftparchive;, &debsign;, &debsig-verify;, &gpg; diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr index d705b9e3e..651100497 100644 --- a/doc/fr/apt.ent.fr +++ b/doc/fr/apt.ent.fr @@ -56,8 +56,8 @@ " > - - apt-archive + + apt-ftparchive 1 " > diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml index e20b86561..20c57fb16 100644 --- a/doc/ja/apt-secure.ja.8.xml +++ b/doc/ja/apt-secure.ja.8.xml @@ -325,7 +325,7 @@ --> 関連項目 -&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;, +&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, &debsign; &debsig-verify;, &gpg; diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja index d63342461..1d1c36b1e 100644 --- a/doc/ja/apt.ent.ja +++ b/doc/ja/apt.ent.ja @@ -56,8 +56,8 @@ " > - - apt-archive + + apt-ftparchive 1 " > -- cgit v1.2.3 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. --- doc/apt-get.8.xml | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'doc') 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 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. --- doc/apt-cache.8.xml | 6 ++++++ doc/apt-get.8.xml | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) (limited to 'doc') 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 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. --- doc/apt-get.8.xml | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) (limited to 'doc') 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 From 972ea2a113abdd6f7cde4ad1dcbda16361343418 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 14:01:24 +0200 Subject: Mentioned 'apt_preferences(5)' in apt manpage. --- doc/apt.8 | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/apt.8 b/doc/apt.8 index 6c14559e3..78e4f0a70 100644 --- a/doc/apt.8 +++ b/doc/apt.8 @@ -37,6 +37,7 @@ None. .BR apt-get (8), .BR apt.conf (5), .BR sources.list (5), +.BR apt_preferences (5), .BR apt-secure (8) .SH DIAGNOSTICS apt returns zero on normal operation, decimal 100 on error. -- cgit v1.2.3 From c2c45f40e2625e0382c48dcba7645e0ac5ed06f8 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 14:27:43 +0200 Subject: Fixed placing for 'xvcg' entry, added missing closing tags. --- doc/apt-cache.8.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 520c3cdca..21605ff0e 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -242,11 +242,6 @@ 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 @@ -255,6 +250,11 @@ Reverse Provides: Caution, dotty cannot graph larger sets of packages. + xvcg pkg(s) + The same as dotty, only for xvcg from the + VCG tool. + + policy [ pkg(s) ] policy is meant to help debug issues relating to the preferences file. With no arguments it will print out the -- cgit v1.2.3 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') 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 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') 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 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') 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 From 60a8f9c0fea353a5dc3f79e634214d7be3d1122b Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 11:50:48 +0200 Subject: Documented 'APT::Default-Release' in apt.conf. --- doc/apt.conf.5.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 64724f211..3a2ad70df 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -98,6 +98,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; compiled for. + Default-Release + Default release to install packages from if more than one + version available. Contains release name or release version. Examples: 'stable', 'testing', 'unstable', '4.0', '5.0*'. Release codenames ('etch', 'lenny' etc.) are not allowed now. See also &apt-preferences;. + + Ignore-Hold Ignore Held packages; This global option causes the problem resolver to ignore held packages in its decision making. -- cgit v1.2.3 From 50c2691814f0a522a2f78c499d20decd4dc8be3a Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 12:16:25 +0200 Subject: Changed 'Install-Recommends' to 'true' in configure-index. --- doc/examples/configure-index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/examples/configure-index b/doc/examples/configure-index index c20011c9c..6af2c01ba 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -103,7 +103,7 @@ APT // consider Recommends, Suggests as important dependencies that should // be installed by default - Install-Recommends "false"; + Install-Recommends "true"; Install-Suggests "false"; // consider dependencies of packages in this section manual -- cgit v1.2.3 From 8070717c2cf131cf0726366c9d6cf4c03fa0354f Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 12:23:18 +0200 Subject: Added APT::Get::AllowUnauthenticated to configure-index. --- doc/examples/configure-index | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 6af2c01ba..d0c453a1c 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -32,6 +32,7 @@ APT Get { Arch-Only "false"; + AllowUnauthenticated "false"; AutomaticRemove "false"; HideAutoRemove "false"; Download-Only "false"; -- cgit v1.2.3 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') 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 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. --- doc/apt-get.8.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') 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 From 0d70b0559c22c006076acbe0d3238f41ddd04072 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 13:15:42 +0200 Subject: Documented 'Acquire::PDiffs' in apt.conf manpage. --- doc/apt.conf.5.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 3a2ad70df..5b71384a7 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -163,6 +163,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; and the URI handlers. + PDiffs + Try do download deltas called PDiffs for + Packages or Sources files instead of downloading whole ones. True + by default. + + Queue-Mode Queuing mode; Queue-Mode can be one of host or access which determines how APT parallelizes outgoing -- cgit v1.2.3 From c06b16a905570845c372f10bb0b310bd7a667945 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 13:25:19 +0200 Subject: Added 'rsh', 'ssh' and 'copy' to the list of URI schemes in sources.list manpage. --- doc/sources.list.5.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e47418b27..bb154b3b0 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -115,7 +115,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/ URI specification - The currently recognized URI types are cdrom, file, http, and ftp. + The currently recognized URI types are cdrom, file, http, ftp, copy, + ssh, rsh. file -- cgit v1.2.3 From b2d941c5f99ac1cf396bb7b7959cd0683051ef28 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 14:10:17 +0200 Subject: Removed notice that ssh/rsh access cannot use password authentication from sources.list manpage. --- doc/sources.list.5.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index bb154b3b0..8b041391a 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -164,8 +164,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/ rshssh The rsh/ssh method invokes rsh/ssh to connect to a remote host - as a given user and access the files. No password authentication is - possible, prior arrangements with RSA keys or rhosts must have been made. + as a given user and access the files. It is a good idea to do prior + arrangements with RSA keys or rhosts. Access to files on the remote uses standard find and dd commands to perform the file transfers from the remote. -- cgit v1.2.3 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') 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 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') 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 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') 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