diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 6 | ||||
| -rw-r--r-- | doc/apt_preferences.5.xml | 6 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index a44a603e3..9e14c562c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,7 @@ apt (0.8.11) UNRELEASED; urgency=low - remove duplicated mentioning of --install-recommends * doc/sources.list.5.xml: - remove obsolete references to non-us (Closes: #594495) + - a notice is printed for ignored files (Closes: #597615) * debian/rules: - use -- instead of deprecated -u for dh_gencontrol - remove shlibs.local creation and usage @@ -103,7 +104,7 @@ apt (0.8.11) UNRELEASED; urgency=low will actually test uncompressed indexes regardless of the internal default value of Acquire::GzipIndexes. - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 07 Feb 2011 21:42:06 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 07 Feb 2011 22:14:09 +0100 apt (0.8.10.3) unstable; urgency=low diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index a423dac24..477507598 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -52,8 +52,10 @@ <listitem><para>all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending order which have no or "<literal>conf</literal>" as filename extension and which only contain alphanumeric, - hyphen (-), underscore (_) and period (.) characters - - otherwise they will be silently ignored.</para></listitem> + hyphen (-), underscore (_) and period (.) characters. + Otherwise APT will print a notice that it has ignored a file if the file + doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> + configuration list - in this case it will be silently ignored.</para></listitem> <listitem><para>the main configuration file specified by <literal>Dir::Etc::main</literal></para></listitem> <listitem><para>the command line options are applied to override the diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 54c01100c..0d22d0413 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -71,8 +71,10 @@ You have been warned.</para> directory are parsed in alphanumeric ascending order and need to obey the following naming convention: The files have no or "<literal>pref</literal>" as filename extension and which only contain alphanumeric, hyphen (-), -underscore (_) and period (.) characters - otherwise they will be silently -ignored.</para> +underscore (_) and period (.) characters. +Otherwise APT will print a notice that it has ignored a file if the file +doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> +configuration list - in this case it will be silently ignored.</para> <refsect2><title>APT's Default Priority Assignments</title> diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 212ed6d98..837f07683 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -57,7 +57,9 @@ File names need to end with <filename>.list</filename> and may only contain letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) characters. - Otherwise they will be silently ignored.</para> + Otherwise APT will print a notice that it has ignored a file if the file + doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> + configuration list - in this case it will be silently ignored.</para> </refsect1> <refsect1><title>The deb and deb-src types</title> |