From 90c2436367d7c136467296d7726e6934bd65fe66 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 12 Aug 2009 17:13:18 +0200 Subject: [doc/apt-get.8.xml] - update the source description to reflect what it actually does and how it can be used. (Closes: #413021) --- doc/apt-get.8.xml | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 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 920f6b36e..8db2883c4 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -85,9 +85,19 @@ purge pkg source pkg - - =pkg_version_number - + + + + =pkg_version_number + + + /target_release_name + + + /target_release_codename + + + build-dep pkg @@ -240,13 +250,22 @@ source causes apt-get to fetch source packages. APT will examine the available packages to decide which source package to fetch. It will then find and download into the current directory the - newest available version of that source package. Source packages are - tracked separately from binary packages via deb-src type lines - in the &sources-list; file. This probably will mean that you will not - get the same source as the package you have installed or as you could - install. If the --compile options is specified then the package will be - compiled to a binary .deb using dpkg-buildpackage, if --download-only is - specified then the source package will not be unpacked. + newest available version of that source package while respect the + default release, set with the option APT::Default-Release, + the option or per package with with the + pkg/release syntax, if possible. + + Source packages are tracked separately + from binary packages via deb-src type 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. + + If the options is specified + then the package will be compiled to a binary .deb using + dpkg-buildpackage, if + is specified then the source package will not be unpacked. A specific source version can be retrieved by postfixing the source name with an equals and then the version to fetch, similar to the mechanism -- cgit v1.2.3-70-g09d2 From f0599b9c2ee704f97dbea17262107c55f527bbf0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 12:21:54 +0200 Subject: [ Nicolas François ] * doc/*.?.xml (manpages): - add contrib to author tags and also add refmiscinfo to fix warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 4 ++++ doc/apt-cache.8.xml | 1 + doc/apt-cdrom.8.xml | 1 + doc/apt-config.8.xml | 1 + doc/apt-extracttemplates.1.xml | 1 + doc/apt-ftparchive.1.xml | 1 + doc/apt-get.8.xml | 1 + doc/apt-key.8.xml | 1 + doc/apt-mark.8.xml | 1 + doc/apt-secure.8.xml | 1 + doc/apt-sortpkgs.1.xml | 1 + doc/apt.conf.5.xml | 1 + doc/apt.ent | 27 +++++++-------------------- doc/apt_preferences.5.xml | 1 + doc/sources.list.5.xml | 1 + 15 files changed, 24 insertions(+), 20 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index 4923f913f..ed2c91b0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,10 @@ apt (0.7.22.3) unstable; urgency=low * apt-pkg/indexcopy.cc: - fix a memory leak then the Release file not exists (Closes: #511556) + [ Nicolas François ] + * doc/*.?.xml (manpages): + - add contrib to author tags and also add refmiscinfo to fix warnings + -- David Kalnischkies Sat, 08 Aug 2009 09:40:08 +0200 apt (0.7.22.2) unstable; urgency=low diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 6c8938d8c..8b76f55b9 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -21,6 +21,7 @@ apt-cache 8 + APT diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index 6ab8fad9c..e57942610 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -20,6 +20,7 @@ apt-cdrom 8 + APT diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index 39fed5937..d4d36891f 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -21,6 +21,7 @@ apt-config 8 + APT diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index 0f4ac04d9..77b837022 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -21,6 +21,7 @@ apt-extracttemplates 1 + APT diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index de7e5f7a3..7131303ae 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -21,6 +21,7 @@ apt-ftparchive 1 + APT diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 8db2883c4..b87e17247 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -21,6 +21,7 @@ apt-get 8 + APT diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 4b3e7c220..7b0691b5e 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -13,6 +13,7 @@ apt-key 8 + APT diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index f078f2de5..35412d7c9 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -21,6 +21,7 @@ apt-mark 8 + APT diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 9696e018d..20f473f77 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -13,6 +13,7 @@ apt-secure 8 + APT diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 59235f115..2412260e7 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -27,6 +27,7 @@ apt.conf 5 + APT diff --git a/doc/apt.ent b/doc/apt.ent index 4cfc00069..43ac2f8e5 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -158,7 +158,10 @@
apt@packages.debian.org
- Jason Gunthorpe + + Jason Gunthorpe + + 1998-2001 Jason Gunthorpe 28 October 2008 Linux @@ -176,6 +179,7 @@ Jason Gunthorpe + "> @@ -183,12 +187,14 @@ Mike O'Connor + "> APT team + "> @@ -196,25 +202,6 @@ Linux "> - - apt@packages.debian.org - -"> - - - Jason - Gunthorpe - -"> - - - APT team - -"> - Jason Gunthorpe diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index ff63f1dd3..12ea606b7 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -20,6 +20,7 @@ apt_preferences 5 + APT diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index b875086ef..c758be61f 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -21,6 +21,7 @@ sources.list 5 + APT -- cgit v1.2.3-70-g09d2 From 6da747804c63f103f431706af80f793b86c41993 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 14:27:17 +0200 Subject: doc/apt-get.8.xml: fix two little typos in the --simulate description. (half-closes #545059) --- debian/changelog | 2 ++ doc/apt-get.8.xml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index 34691b1fb..3d8dc292a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.24) UNRELEASED; urgency=low - add a helper to easily get a vector of strings from the config * apt-pkg/contrib/strutl.cc: - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) + * doc/apt-get.8.xml: + - fix two little typos in the --simulate description. -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index b87e17247..3a1292198 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -384,9 +384,9 @@ Configuration Item: APT::Get::Simulate. Simulation run as user will deactivate locking (Debug::NoLocking) - automatical. 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) - Neigther NoLocking nor the notice will be triggered if run as root (root should know what + 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). Simulate prints out -- cgit v1.2.3-70-g09d2 From 1221c3a38f9962ea7ac866eb507fdd798481b5d4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 17:43:47 +0200 Subject: doc/apt.ent: move the description of files to globally usable entities --- debian/changelog | 2 ++ doc/apt-cache.8.xml | 17 ++------------ doc/apt-get.8.xml | 49 +++++----------------------------------- doc/apt.conf.5.xml | 10 +-------- doc/apt.ent | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 68 deletions(-) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index 5ddd84117..c5a786919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.24) UNRELEASED; urgency=low * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml: - add an order subgroup to the compression types to simplify reordering a bit and improve the documentation for this option group. + * doc/apt.ent, all man pages: + - move the description of files to globally usable entities -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 8b76f55b9..26d55a519 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -357,21 +357,8 @@ Reverse Provides: Files - /etc/apt/sources.list - Locations to fetch packages from. - Configuration Item: Dir::Etc::SourceList. - - - &statedir;/lists/ - Storage area for state information for each package resource specified in - &sources-list; - Configuration Item: Dir::State::Lists. - - - &statedir;/lists/partial/ - Storage area for state information in transit. - Configuration Item: Dir::State::Lists (implicit partial). - + &file-sourceslist; + &file-statelists; diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 3a1292198..ec773edeb 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -558,50 +558,11 @@ Files - /etc/apt/sources.list - Locations to fetch packages from. - Configuration Item: Dir::Etc::SourceList. - - - /etc/apt/apt.conf - APT configuration file. - Configuration Item: Dir::Etc::Main. - - - /etc/apt/apt.conf.d/ - APT configuration file fragments. - Configuration Item: Dir::Etc::Parts. - - - /etc/apt/preferences - Version preferences file. - This is where you would specify "pinning", - i.e. a preference to get certain packages - from a separate source - or from a different version of a distribution. - Configuration Item: Dir::Etc::Preferences. - - - &cachedir;/archives/ - Storage area for retrieved package files. - Configuration Item: Dir::Cache::Archives. - - - &cachedir;/archives/partial/ - Storage area for package files in transit. - Configuration Item: Dir::Cache::Archives (implicit partial). - - - &statedir;/lists/ - Storage area for state information for each package resource specified in - &sources-list; - Configuration Item: Dir::State::Lists. - - - &statedir;/lists/partial/ - Storage area for state information in transit. - Configuration Item: Dir::State::Lists (implicit partial). - + &file-sourceslist; + &file-aptconf; + &file-preferences; + &file-cachearchives; + &file-statelists; diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 92ac5ec04..81be753f9 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -858,15 +858,7 @@ is commented. Files - /etc/apt/apt.conf - APT configuration file. - Configuration Item: Dir::Etc::Main. - - - /etc/apt/apt.conf.d/ - APT configuration file fragments. - Configuration Item: Dir::Etc::Parts. - + &file-aptconf; diff --git a/doc/apt.ent b/doc/apt.ent index 43ac2f8e5..9a4c17bcd 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -289,3 +289,67 @@ "> +/etc/apt/apt.conf + APT configuration file. + Configuration Item: Dir::Etc::Main. + + + /etc/apt/apt.conf.d/ + APT configuration file fragments. + Configuration Item: Dir::Etc::Parts. + +"> + +&cachedir;/archives/ + Storage area for retrieved package files. + Configuration Item: Dir::Cache::Archives. + + + &cachedir;/archives/partial/ + Storage area for package files in transit. + Configuration Item: Dir::Cache::Archives (implicit partial). + +"> + +/etc/apt/preferences + Version preferences file. + This is where you would specify "pinning", + i.e. a preference to get certain packages + from a separate source + or from a different version of a distribution. + Configuration Item: Dir::Etc::Preferences. + + + /etc/apt/preferences.d/ + File fragments for the version preferences. + Configuration Item: Dir::Etc::PreferencesParts. + +"> + +/etc/apt/sources.list + Locations to fetch packages from. + Configuration Item: Dir::Etc::SourceList. + + + /etc/apt/sources.list.d/ + File fragments for locations to fetch packages from. + Configuration Item: Dir::Etc::SourceParts. + +"> + +&statedir;/lists/ + Storage area for state information for each package resource specified in + &sources-list; + Configuration Item: Dir::State::Lists. + + + &statedir;/lists/partial/ + Storage area for state information in transit. + Configuration Item: Dir::State::Lists (implicit partial). + +"> -- cgit v1.2.3-70-g09d2 From 7fa2e810e2cec43564c23bd17d5100b355e84593 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 26 Sep 2009 19:27:19 +0200 Subject: Fix typo --- debian/changelog | 1 + doc/apt-get.8.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/apt-get.8.xml') diff --git a/debian/changelog b/debian/changelog index 98b9981d1..9d3a0a868 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ apt (0.7.25) UNRELEASED; urgency=low Thanks to Dann Frazier for the patch. Closes: #273100 * po/LINGUAS. Re-disable Hebrew. Closes: #534992 * Fix typo in apt-cache.8.xml: nessasarily + * Fix "with with" in apt-get.8.xml -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index ec773edeb..4735dcd34 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -253,7 +253,7 @@ fetch. It will then find and download into the current directory the newest available version of that source package while respect the default release, set with the option APT::Default-Release, - the option or per package with with the + the option or per package with the pkg/release syntax, if possible. Source packages are tracked separately -- cgit v1.2.3-70-g09d2