From c086ac18511ce648a0ed88ab470965470bd422c5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 20 May 2012 18:24:23 +0200 Subject: * doc/*.xml: - add a few translator notes and reword some paragraphs to ensure that translators and users alike can better understand them (Closes: #669409) --- doc/apt.conf.5.xml | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'doc/apt.conf.5.xml') diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 2f95c1e52..ff9942e5f 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -127,14 +127,14 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; All of the APT tools take a -o option which allows an arbitrary configuration directive to be specified on the command line. The syntax is a full option name (APT::Get::Assume-Yes for instance) followed by an equals - sign then the new value of the option. Lists can be appended too by adding - a trailing :: to the list name. (As you might suspect: The scope syntax can't be used - on the command line.) + sign then the new value of the option. To append a new element to a list, add a + trailing :: to the name of the list. (As you might suspect: The scope syntax can't + be used on the command line.) Note that you can use :: only for appending one item per line to a list and that you should not use it in combination with the scope syntax. (The scope syntax implicit insert ::) Using both syntaxes together will trigger a bug - which some users unfortunately relay on: An option with the unusual name "::" + which some users unfortunately depend on: An option with the unusual name "::" which acts like every other option with a name. These introduces many problems including that a user who writes multiple lines in this wrong syntax in the hope to append to a list will gain the opposite as only the last assignment for this option @@ -155,8 +155,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Architectures - All Architectures the system supports. Processors implementing the amd64 - are e.g. also able to execute binaries compiled for i386; This list is use when fetching files and + All Architectures the system supports. Processors implementing the + amd64 (also called x86-64) instruction set are + e.g. also able to execute binaries compiled for the i386 + (x86) instruction set; This list is use when fetching files and parsing package lists. The internal default is always the native architecture (APT::Architecture) and all foreign architectures it can retrieve by calling dpkg --print-foreign-architectures. @@ -216,10 +218,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; APT uses since version 0.7.26 a resizable memory mapped cache file to store the 'available' information. Cache-Start acts as a hint to which size the Cache will grow and is therefore the amount of memory APT will request at startup. The default value is - 20971520 bytes (~20 MB). Note that these amount of space need to be available for APT - otherwise it will likely fail ungracefully, so for memory restricted devices these value should - be lowered while on systems with a lot of configured sources this might be increased. - Cache-Grow defines in byte with the default of 1048576 (~1 MB) how much + 20971520 bytes (~20 MB). Note that this amount of space needs to be available for APT + otherwise it will likely fail ungracefully, so for memory restricted devices this value should + be lowered while on systems with a lot of configured sources it should be increased. + Cache-Grow defines in bytes with the default of 1048576 (~1 MB) how much the Cache size will be increased in the event the space defined by Cache-Start is not enough. These value will be applied again and again until either the cache is big enough to store all information or the size of the cache reaches the Cache-Limit. @@ -270,7 +272,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; it was created (indicated by the Date header). If the Release file itself includes a Valid-Until header the earlier date of the two is used as the expiration date. - The default value is 0 which stands for "for ever". + The default value is 0 which stands for "for ever valid". Archive specific settings can be made by appending the label of the archive to the option name. @@ -293,7 +295,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; by default. Two sub-options to limit the use of PDiffs are also available: With FileLimit can be specified how many PDiff files - are downloaded at most to patch a file. SizeLimit + are downloaded at most to update a file. SizeLimit on the other hand is the maximum percentage of the size of all patches compared to the size of the targeted file. If one of these limits is exceeded the complete file is downloaded instead of the patches. @@ -347,6 +349,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; is now 0 (= disabled) to avoid problems with the ever-growing amount of webservers and proxies which choose to not conform to the HTTP/1.1 specification. + Acquire::http::AllowRedirect controls if APT will follow + redirects, which is enabled by default. + The used bandwidth can be limited with Acquire::http::Dl-Limit which accepts integer values in kilobyte. The default value is 0 which deactivates the limit and tries uses as much as possible of the bandwidth (Note that this option implicit @@ -493,7 +498,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; actually use them if the environment doesn't specify this languages. So the following example configuration will result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded, but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en". - Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; }; + Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; }; + Note: To prevent problems resulting from APT being executed in different environments + (e.g. by different users or by other programs) all Translation files which are found in + /var/lib/apt/lists/ will be added to the end of the list + (after an implicit "none"). + @@ -505,7 +515,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; The Dir::State section has directories that pertain to local state information. lists is the directory to place downloaded package lists in and status is the name of the dpkg status file. - preferences is the name of the APT preferences file. + preferences is the name of the APT preferences file. Dir::State contains the default directory to prefix on all sub items if they do not start with / or ./. -- cgit v1.2.3