Переглянути джерело

* Better documentation on using both APT::Default-Release and /etc/apt/preferences (closes: #145575)

Luca Bruno 18 роки тому
батько
коміт
99fc3e085d
3 змінених файлів з 9 додано та 2 видалено
  1. 2 0
      debian/changelog
  2. 4 2
      doc/apt-get.8.xml
  3. 3 0
      doc/apt_preferences.5.xml

+ 2 - 0
debian/changelog

@@ -3,6 +3,8 @@ apt (0.7.15~exp4) UNRELEASED; urgency=low
   [Luca Bruno]
   [Luca Bruno]
   * Fix some typos in docs and translations (thanks to timeless, closes: #368665)
   * 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)
   * 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
  -- Luca Bruno <lethalman88@gmail.com>  Fri, 03 Oct 2008 20:00:18 +0200
 
 

+ 4 - 2
doc/apt-get.8.xml

@@ -371,8 +371,10 @@
                    <term><option>--target-release</option></term>
                    <term><option>--target-release</option></term>
                    <term><option>--default-release</option></term>
                    <term><option>--default-release</option></term>
      <listitem><para>This option controls the default input to the policy engine, it creates
      <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
      lets you have simple control over which distribution packages will be
      retrieved from. Some common examples might be 
      retrieved from. Some common examples might be 
      <option>-t '2.1*'</option> or <option>-t unstable</option>.
      <option>-t '2.1*'</option> or <option>-t unstable</option>.

+ 3 - 0
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.
 which receives a higher priority than other distributions do by default.
 The target release can be set on the <command>apt-get</command> command
 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>.
 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,
 For example,
 
 
 <programlisting>
 <programlisting>