diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-06-29 16:29:54 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-06-29 16:29:54 +0200 |
| commit | a9d2fdce1f1d5b4b428c215189a5b204ff91108b (patch) | |
| tree | 87870e8f3c6c66653dabe165fde5cc78a8b337e4 /doc/apt.conf.5.xml | |
| parent | aaa7858c3583617b068bd87af4e17be4d02da0bf (diff) | |
| parent | e449f717078978396b76a2fdae844196888d0211 (diff) | |
merge with debian-sid release 0.8.15
Diffstat (limited to 'doc/apt.conf.5.xml')
| -rw-r--r-- | doc/apt.conf.5.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 477507598..02de89f3b 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -50,7 +50,7 @@ <listitem><para>the file specified by the <envar>APT_CONFIG</envar> environment variable (if any)</para></listitem> <listitem><para>all files in <literal>Dir::Etc::Parts</literal> in - alphanumeric ascending order which have no or "<literal>conf</literal>" + alphanumeric ascending order which have either no or "<literal>conf</literal>" as filename extension and which only contain alphanumeric, hyphen (-), underscore (_) and period (.) characters. Otherwise APT will print a notice that it has ignored a file if the file @@ -441,13 +441,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; It is not needed to add <literal>bz2</literal> explicit to the list as it will be added automatic.</para> <para>Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be checked: If this setting exists the method will only be used if this file exists, e.g. for - the bzip2 method (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout> + the bzip2 method (the inbuilt) setting is: <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout> Note also that list entries specified on the command line will be added at the end of the list specified in the configuration files, but before the default entries. To prefer a type in this case over the ones specified in the configuration files you can set the option direct - not in list style. This will not override the defined list, it will only prefix the list with this type.</para> <para>The special type <literal>uncompressed</literal> can be used to give uncompressed files a - preference, but note that most archives doesn't provide uncompressed files so this is mostly only + preference, but note that most archives don't provide uncompressed files so this is mostly only useable for local mirrors.</para></listitem> </varlistentry> |