diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-15 09:53:38 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-15 09:53:38 +0200 |
| commit | 6db194289ece36e62cb8dab0aa178209b46c59f2 (patch) | |
| tree | 6e1970919929dd3d2d03d343e4ec40ccad22ad66 /doc | |
| parent | 35555c1826da5df9f2c06a74f2e91be843ad8142 (diff) | |
| parent | 1d08f27046533e36849a63c084f51809be484d8c (diff) | |
merged from http://bzr.debian.org/bzr/apt/apt/debian-sid
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt.conf.5.xml | 10 | ||||
| -rw-r--r-- | doc/examples/configure-index | 1 |
2 files changed, 10 insertions, 1 deletions
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 |