diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 6 | ||||
| -rw-r--r-- | doc/apt_preferences.5.xml | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index fe63ecdf3..c2581b52e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.15~exp4) UNRELEASED; urgency=low [Luca Bruno] * Fix some typos in docs and translations (thanks to timeless, closes: #368665) * Document apt-key finger and adv commands (thanks to Stefan Schmidt, closes: #350575) + * Better documentation on using both APT::Default-Release and + /etc/apt/preferences (thanks to Ingo Saitz, closes: #145575) -- Luca Bruno <lethalman88@gmail.com> Fri, 03 Oct 2008 20:00:18 +0200 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 @@ <term><option>--target-release</option></term> <term><option>--default-release</option></term> <listitem><para>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 <filename>/etc/apt/preferences</filename>. + 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 <option>-t '2.1*'</option> or <option>-t unstable</option>. diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index c55bb4ee2..162c2f00e 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -60,6 +60,9 @@ belongs. It is possible to single out a distribution, "the target release", which receives a higher priority than other distributions do by default. The target release can be set on the <command>apt-get</command> command line or in the APT configuration file <filename>/etc/apt/apt.conf</filename>. +Note that this has precedence over any general priority you set in the +<filename>/etc/apt/preferences</filename> file described later, but not +over specifically pinned packages. For example, <programlisting> |