diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 7c92bee6d..643ea2a02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,7 @@ apt (0.7.17) unstable; urgency=low some of installed packages. Based on patch by Nori Heikkinen and Andre Felipe Machado. (Closes: #267087) - Mentioned 'apt_preferences(5)' in apt manpage. (Closes: #274295) + - Documented 'APT::Default-Release' in apt.conf. (Closes: #430399) -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 24 Oct 2008 23:45:17 +0300 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.</para></listitem> </varlistentry> + <varlistentry><term>Default-Release</term> + <listitem><para>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;.</para></listitem> + </varlistentry> + <varlistentry><term>Ignore-Hold</term> <listitem><para>Ignore Held packages; This global option causes the problem resolver to ignore held packages in its decision making.</para></listitem> |