diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-07-05 15:34:43 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-07-05 15:34:43 +0200 |
| commit | 58014adc6df1772567e0bc32687f1a03cfcb49fb (patch) | |
| tree | 91ebf756946afc749435115856131fca6490fdba | |
| parent | 64aadc2d005d601074c1599ee51cee08745cfa36 (diff) | |
* doc/apt.conf.5.xml:
- document APT::Architectures list (Closes: #612102)
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 10 | ||||
| -rw-r--r-- | doc/examples/configure-index | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index dc0f08333..af7e792db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,10 @@ apt (0.8.15.2) unstable; urgency=low told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591) * doc/sources.list.5.xml: - document available [options] for sources.list entries (Closes: 632441) + * doc/apt.conf.5.xml: + - document APT::Architectures list (Closes: #612102) - -- David Kalnischkies <kalnischkies@gmail.com> Tue, 05 Jul 2011 15:12:21 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Tue, 05 Jul 2011 15:31:55 +0200 apt (0.8.15.1) unstable; urgency=low diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 02de89f3b..2634c47a9 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -153,7 +153,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; parsing package lists. The internal default is the architecture apt was compiled for.</para></listitem> </varlistentry> - + + <varlistentry><term>Architectures</term> + <listitem><para>All Architectures the system supports. Processors implementing the <literal>amd64</literal> + are e.g. also able to execute binaries compiled for <literal>i386</literal>; This list is use when fetching files and + parsing package lists. The internal default is always the native architecture (<literal>APT::Architecture</literal>) + and all foreign architectures it can retrieve by calling <command>dpkg --print-foreign-architectures</command>. + </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, codename or release version. Examples: 'stable', 'testing', diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 6884e06e3..27232d40b 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -23,6 +23,7 @@ quiet::NoUpdate "true"; // never update progress information - included in -q=1 APT { Architecture "i386"; + Architectures { "amd64"; "armel"; }; Build-Essential "build-essential"; NeverAutoRemove { "linux-image.*"; }; // packages that should never |