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-cache.8.xml | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'doc/apt-cache.8.xml') diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 42d700c82..dd0ea6e9d 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -46,13 +46,11 @@ gencaches - gencaches performs the same operation as - apt-get check. It builds the source and package caches from - the sources in &sources-list; and from - /var/lib/dpkg/status. + gencaches creates APT's package cache. This is done + implicitly by all commands needing this cache if it is missing or outdated. - showpkg pkg(s) + showpkg &synopsis-pkg; showpkg displays information about the packages listed on the command line. Remaining arguments are package names. The available versions and reverse dependencies of each package listed are listed, as @@ -141,7 +139,7 @@ Reverse Provides: - showsrc pkg(s) + showsrc &synopsis-pkg; showsrc displays all the source package records that match the given package names. All versions are shown, as well as all records that declare the name to be a Binary. @@ -162,13 +160,13 @@ Reverse Provides: package cache. - show pkg(s) + show &synopsis-pkg; show performs a function similar to dpkg --print-avail; it displays the package records for the named packages. - search regex [ regex ... ] + search &synopsis-regex; search performs a full text search on all available package lists for the POSIX regex pattern given, see regex @@ -186,17 +184,17 @@ Reverse Provides: are and'ed together. - depends pkg(s) + depends &synopsis-pkg; depends shows a listing of each dependency a package has and all the possible other packages that can fulfill that dependency. - rdepends pkg(s) + rdepends &synopsis-pkg; rdepends shows a listing of each reverse dependency a package has. - pkgnames [ prefix ] + pkgnames [ &synopsis-prefix; ] This command prints the name of each package APT knows. The optional argument is a prefix match to filter the name list. The output is suitable for use in a shell tab complete function and the output is generated @@ -207,7 +205,7 @@ Reverse Provides: - dotty pkg(s) + dotty &synopsis-pkg; dotty takes a list of packages on the command line and generates output suitable for use by dotty from the GraphViz @@ -225,19 +223,19 @@ Reverse Provides: Caution, dotty cannot graph larger sets of packages. - xvcg pkg(s) + xvcg &synopsis-pkg; The same as dotty, only for xvcg from the VCG tool. - policy [ pkg(s) ] + policy [ &synopsis-pkg;… ] policy is meant to help debug issues relating to the preferences file. With no arguments it will print out the priorities of each source. Otherwise it prints out detailed information about the priority selection of the named package. - madison [ pkg(s) ] + madison &synopsis-pkg; apt-cache's madison command attempts to mimic the output format and a subset of the functionality of the Debian archive management tool, madison. It displays -- cgit v1.2.3-70-g09d2 From 2b9b27c395d75a0c06e7eca65746e5567e459dac Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 21 May 2012 04:40:48 +0200 Subject: in mark all options with - gencaches + gencaches creates APT's package cache. This is done implicitly by all commands needing this cache if it is missing or outdated. - showpkg &synopsis-pkg; + showpkg displays information about the packages listed on the command line. Remaining arguments are package names. The available versions and reverse dependencies of each package listed are listed, as @@ -84,7 +84,7 @@ Reverse Provides: is best to consult the apt source code. - statsstats displays some statistics about the cache. + stats displays some statistics about the cache. No further arguments are expected. Statistics reported are: Total package names is the number of package names found @@ -139,34 +139,34 @@ Reverse Provides: - showsrc &synopsis-pkg; + showsrc displays all the source package records that match the given package names. All versions are shown, as well as all records that declare the name to be a Binary. - dump + dump shows a short listing of every package in the cache. It is primarily for debugging. - dumpavail + dumpavail prints out an available list to stdout. This is suitable for use with &dpkg; and is used by the &dselect; method. - unmet + unmet displays a summary of all unmet dependencies in the package cache. - show &synopsis-pkg; + show performs a function similar to dpkg --print-avail; it displays the package records for the named packages. - search &synopsis-regex; + search performs a full text search on all available package lists for the POSIX regex pattern given, see regex @@ -184,17 +184,17 @@ Reverse Provides: are and'ed together. - depends &synopsis-pkg; + depends shows a listing of each dependency a package has and all the possible other packages that can fulfill that dependency. - rdepends &synopsis-pkg; + rdepends shows a listing of each reverse dependency a package has. - pkgnames [ &synopsis-prefix; ] + &synopsis-prefix; This command prints the name of each package APT knows. The optional argument is a prefix match to filter the name list. The output is suitable for use in a shell tab complete function and the output is generated @@ -205,7 +205,7 @@ Reverse Provides: - dotty &synopsis-pkg; + dotty takes a list of packages on the command line and generates output suitable for use by dotty from the GraphViz @@ -223,19 +223,19 @@ Reverse Provides: Caution, dotty cannot graph larger sets of packages. - xvcg &synopsis-pkg; + The same as dotty, only for xvcg from the VCG tool. - policy [ &synopsis-pkg;… ] + &synopsis-pkg; policy is meant to help debug issues relating to the preferences file. With no arguments it will print out the priorities of each source. Otherwise it prints out detailed information about the priority selection of the named package. - madison &synopsis-pkg; + apt-cache's madison command attempts to mimic the output format and a subset of the functionality of the Debian archive management tool, madison. It displays diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index 94fc6fd8b..969491740 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -52,7 +52,7 @@ given one of the commands below must be present. - add + add is used to add a new disc to the source list. It will unmount the CDROM device, prompt for a disk to be inserted and then proceed to @@ -68,7 +68,7 @@ - ident + A debugging tool to report the identity of the current disc as well as the stored file name diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index 0295cb193..94c247dd1 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -46,7 +46,7 @@ - shell + shell is used to access the configuration information from a shell script. It is given pairs of arguments, the first being a shell @@ -72,7 +72,7 @@ eval $RES - dump + Just show the contents of the configuration space. diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index 8f28f8c54..f1f316822 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -43,8 +43,9 @@ in the format: package version template-file config-script template-file and config-script are written to the temporary directory - specified by the -t or --tempdir (APT::ExtractTemplates::TempDir) - directory, with filenames of the form package.template.XXXX and + specified by the or + (APT::ExtractTemplates::TempDir) directory, + with filenames of the form package.template.XXXX and package.config.XXXX diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 93b109af1..fbc3afb10 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -55,7 +55,7 @@ commands below must be present. - packages + The packages command generates a package file from a directory tree. It takes the given directory and recursively searches it for .deb files, @@ -65,7 +65,7 @@ The option can be used to specify a binary caching DB. - sources + The sources command generates a source index file from a directory tree. It takes the given directory and recursively searches it for .dsc files, @@ -77,7 +77,7 @@ used to change the source override file that will be used. - contents + The contents command generates a contents file from a directory tree. It takes the given directory and recursively searches it for .deb files, @@ -89,7 +89,7 @@ The option can be used to specify a binary caching DB. - release + The release command generates a Release file from a directory tree. It recursively searches the given directory for uncompressed @@ -112,7 +112,7 @@ - generate + The generate command is designed to be runnable from a cron script and builds indexes according to the given config file. The config language @@ -121,7 +121,7 @@ required settings. - clean + The clean command tidies the databases used by the given configuration file by removing any records that are no longer necessary. @@ -148,24 +148,24 @@ directories are prepended certain relative paths defined in later sections to produce a complete an absolute path. - ArchiveDir + Specifies the root of the FTP archive, in a standard Debian configuration this is the directory that contains the ls-LR and dist nodes. - OverrideDir + Specifies the location of the override files. - CacheDir + Specifies the location of the cache files - FileListDir + Specifies the location of the file list files, if the FileList setting is used below. @@ -179,7 +179,7 @@ that control the operation of the generator. Other sections may override these defaults with a per-section setting. - Packages::Compress + Sets the default compression schemes to use for the Package index files. It is a string that contains a space @@ -187,51 +187,51 @@ 'bzip2'. The default for all compression schemes is '. gzip'. - Packages::Extensions + Sets the default list of file extensions that are package files. This defaults to '.deb'. - Sources::Compress + This is similar to Packages::Compress except that it controls the compression for the Sources files. - Sources::Extensions + Sets the default list of file extensions that are source files. This defaults to '.dsc'. - Contents::Compress + This is similar to Packages::Compress except that it controls the compression for the Contents files. - Translation::Compress + This is similar to Packages::Compress except that it controls the compression for the Translation-en master file. - DeLinkLimit + Specifies the number of kilobytes to delink (and replace with hard links) per run. This is used in conjunction with the per-section External-Links setting. - FileMode + Specifies the mode of all created index files. It defaults to 0644. All index files are set to this mode with no regard to the umask. - LongDescription + Sets if long descriptions should be included in the Packages file or split out into a master Translation-en file. @@ -246,14 +246,14 @@ $(SECTION) and $(ARCH) replaced with their respective values. - MaxContentsChange + Sets the number of kilobytes of contents files that are generated each day. The contents files are round-robined so that over several days they will all be rebuilt. - ContentsAge + Controls the number of days a contents file is allowed to be checked without changing. If this limit is passed the mtime of the @@ -264,45 +264,45 @@ the units are in days. - Directory + Sets the top of the .deb directory tree. Defaults to $(DIST)/$(SECTION)/binary-$(ARCH)/ - SrcDirectory + Sets the top of the source package directory tree. Defaults to $(DIST)/$(SECTION)/source/ - Packages + Sets the output Packages file. Defaults to $(DIST)/$(SECTION)/binary-$(ARCH)/Packages - Sources + Sets the output Sources file. Defaults to $(DIST)/$(SECTION)/source/Sources - Translation + Set the output Translation-en master file with the long descriptions if they should be not included in the Packages file. Defaults to $(DIST)/$(SECTION)/i18n/Translation-en - InternalPrefix + Sets the path prefix that causes a symlink to be considered an internal link instead of an external link. Defaults to $(DIST)/$(SECTION)/ - Contents + Sets the output Contents file. Defaults to $(DIST)/Contents-$(ARCH). If this setting causes multiple @@ -311,25 +311,25 @@ together automatically. - Contents::Header + Sets header file to prepend to the contents output. - BinCacheDB + Sets the binary cache database to use for this section. Multiple sections can share the same database. - FileList + Specifies that instead of walking the directory tree, apt-ftparchive should read the list of files from the given file. Relative files names are prefixed with the archive directory. - SourceFileList + Specifies that instead of walking the directory tree, apt-ftparchive should read the list of files from the given @@ -363,44 +363,44 @@ for i in Sections do - Sections + This is a space separated list of sections which appear under the distribution, typically this is something like main contrib non-free - Architectures + This is a space separated list of all the architectures that appear under search section. The special architecture 'source' is used to indicate that this tree has a source archive. - LongDescription + Sets if long descriptions should be included in the Packages file or split out into a master Translation-en file. - BinOverride + Sets the binary override file. The override file contains section, priority and maintainer address information. - SrcOverride + Sets the source override file. The override file contains section information. - ExtraOverride + Sets the binary extra override file. - SrcExtraOverride + Sets the source extra override file. @@ -415,53 +415,53 @@ for i in Sections do section with no substitution variables or SectionArchitecture settings. - Packages + Sets the Packages file output. - Sources + Sets the Sources file output. At least one of Packages or Sources is required. - Contents + Sets the Contents file output. (optional) - BinOverride + Sets the binary override file. - SrcOverride + Sets the source override file. - ExtraOverride + Sets the binary extra override file. - SrcExtraOverride + Sets the source extra override file. - BinCacheDB + Sets the cache DB. - PathPrefix + Appends a path to all the output paths. - FileList, SourceFileList + Specifies the file list file. @@ -505,7 +505,7 @@ for i in Sections do &apt-cmdblurb; - , , + Generate the given checksum. These options default to on, when turned off the generated index files will not have the checksum fields where possible. diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 15b9701e2..5cd5a5f8d 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -45,7 +45,7 @@ commands below must be present. - update + update is used to resynchronize the package index files from their sources. The indexes of available packages are fetched from the location(s) specified in /etc/apt/sources.list. @@ -57,7 +57,7 @@ of the package files cannot be known in advance. - upgrade + upgrade is used to install the newest versions of all packages currently installed on the system from the sources enumerated in /etc/apt/sources.list. Packages currently installed with @@ -70,7 +70,7 @@ available. - dselect-upgrade + dselect-upgrade is used in conjunction with the traditional Debian packaging front-end, &dselect;. dselect-upgrade @@ -80,7 +80,7 @@ packages). - dist-upgrade + dist-upgrade in addition to performing the function of upgrade, also intelligently handles changing dependencies with new versions of packages; apt-get has a "smart" conflict @@ -93,7 +93,7 @@ overriding the general settings for individual packages. - install + install is followed by one or more packages desired for installation or upgrading. @@ -147,7 +147,7 @@ with a '^' or '$' character, or create a more specific regular expression. - remove + remove is identical to install except that packages are removed instead of installed. Note the removing a package leaves its configuration files in system. If a plus sign is appended to the package @@ -155,12 +155,12 @@ installed instead of removed. - purge + purge is identical to remove except that packages are removed and purged (any configuration files are deleted too). - source + source causes apt-get to fetch source packages. APT will examine the available packages to decide which source package to fetch. It will then find and download into the current directory the @@ -194,25 +194,25 @@ tar balls. - build-dep + build-dep causes apt-get to install/remove packages in an attempt to satisfy the build dependencies for a source package. By default the dependencies are satisfied to build the package natively. If desired a host-architecture can be specified with the option instead. - check + check is a diagnostic tool; it updates the package cache and checks for broken dependencies. - download + download will download the given binary package into the current directory. - clean + clean clears out the local repository of retrieved package files. It removes everything but the lock file from &cachedir;/archives/ and @@ -222,7 +222,7 @@ from time to time to free up disk space. - autoclean + Like clean, autoclean clears out the local repository of retrieved package files. The difference is that it only removes package files that can no longer be downloaded, and are largely @@ -232,17 +232,17 @@ erased if it is set to off. - autoremove + autoremove is used to remove packages that were automatically installed to satisfy dependencies for other packages and are now no longer needed. - changelog + changelog downloads a package changelog and displays it through sensible-pager. The server name and base directory is defined in the APT::Changelogs::Server - variable (e. g. http://packages.debian.org/changelogs for - Debian or http://changelogs.ubuntu.com/changelogs for + variable (e. g. packages.debian.org/changelogs for + Debian or changelogs.ubuntu.com/changelogs for Ubuntu). By default it displays the changelog for the version that is installed. However, you can specify the same options as for diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index a45ad8cd3..e5c8d5a2d 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -37,7 +37,7 @@ Commands - add &synopsis-param-filename; + Add a new key to the list of trusted keys. @@ -49,7 +49,7 @@ - del &synopsis-param-keyid; + @@ -60,7 +60,7 @@ - export &synopsis-param-keyid; + @@ -71,7 +71,7 @@ - exportall + @@ -82,7 +82,7 @@ - list + @@ -93,7 +93,7 @@ - finger + @@ -104,7 +104,7 @@ - adv + @@ -116,7 +116,7 @@ - update + @@ -130,7 +130,7 @@ - net-update + @@ -153,7 +153,7 @@ Options Note that options need to be defined before the commands described in the previous section. - --keyring &synopsis-param-filename; + With this option it is possible to specify a specific keyring file the command should operate on. The default is that a command is executed on the trusted.gpg file as well as on all parts in the diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index d62731124..f56115635 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -48,7 +48,7 @@ apt-get or aptitude. - auto + auto is used to mark a package as being automatically installed, which will cause the package to be removed when no more manually installed packages @@ -56,7 +56,7 @@ - manual + manual is used to mark a package as being manually installed, which will prevent the package from being automatically removed if no other packages @@ -64,7 +64,7 @@ - hold + hold is used to mark a package as hold back, which will prevent the package from being automatically installed, upgraded or removed. @@ -74,13 +74,13 @@ - unhold + unhold is used to cancel a previously set hold on a package to allow all actions again. - showauto + showauto is used to print a list of automatically installed packages with each package on a new line. All automatically installed packages will be listed if no package is given. @@ -88,14 +88,14 @@ - showmanual + showmanual can be used in the same way as showauto except that it will print a list of manually installed packages instead. - showhold + showhold is used to print a list of packages on hold in the same way as for the other show commands. @@ -109,12 +109,12 @@ - - + + - - Read/Write package stats from FILENAME - instead of the default location, which + Read/Write package stats from the filename given with the parameter + &synopsis-filename; + instead of from the default location, which is extended_status in the directory defined by the Configuration Item: Dir::State. diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index ff9942e5f..b521db72c 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -148,13 +148,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; options for all of the tools. - Architecture + System Architecture; sets the architecture to use when fetching files and parsing package lists. The internal default is the architecture apt was compiled for. - Architectures + 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 @@ -164,25 +164,25 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Default-Release + Default release to install packages from if more than one version available. Contains release name, codename or release version. Examples: 'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', '5.0*'. See also &apt-preferences;. - Ignore-Hold + Ignore Held packages; This global option causes the problem resolver to ignore held packages in its decision making. - Clean-Installed + Defaults to on. When turned on the autoclean feature will remove any packages which can no longer be downloaded from the cache. If turned off then packages that are locally installed are also excluded from cleaning - but note that APT provides no direct means to reinstall them. - Immediate-Configure + Defaults to on which will cause APT to install essential and important packages as fast as possible in the install/upgrade operation. This is done to limit the effect of a failing &dpkg; call: If this option is disabled APT does treat an important package in the same way as @@ -205,7 +205,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; improving or correcting the upgrade process. - Force-LoopBreak + Never Enable this option unless you -really- know what you are doing. It permits APT to temporarily remove an essential package to break a Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential @@ -214,7 +214,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; anything that those packages depend on. - Cache-Start, Cache-Grow and Cache-Limit + 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 @@ -230,21 +230,21 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Build-Essential + Defines which package(s) are considered essential build dependencies. - Get + The Get subsection controls the &apt-get; tool, please see its documentation for more information about the options here. - Cache + The Cache subsection controls the &apt-cache; tool, please see its documentation for more information about the options here. - CDROM + The CDROM subsection controls the &apt-cdrom; tool, please see its documentation for more information about the options here. @@ -256,7 +256,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; and the URI handlers. - Check-Valid-Until + Security related option defaulting to true as an expiring validation for a Release file prevents longtime replay attacks and can e.g. also help users to identify no longer updated mirrors - @@ -267,7 +267,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Max-ValidTime + Seconds the Release file should be considered valid after it was created (indicated by the Date header). If the Release file itself includes a Valid-Until header @@ -278,7 +278,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Min-ValidTime + Minimum of seconds the Release file should be considered valid after it was created (indicated by the Date header). Use this if you need to use a seldomly updated (local) mirror of a more @@ -289,7 +289,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - PDiffs + Try to download deltas called PDiffs for Packages or Sources files instead of downloading whole ones. True by default. @@ -302,7 +302,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Queue-Mode + Queuing mode; Queue-Mode can be one of host or access which determines how APT parallelizes outgoing connections. host means that one connection per target host @@ -310,17 +310,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; will be opened. - Retries + Number of retries to perform. If this is non-zero APT will retry failed files the given number of times. - Source-Symlinks + Use symlinks for source archives. If set to true then source archives will be symlinked when possible instead of copying. True is the default. - http + HTTP URIs; http::Proxy is the default http proxy to use. It is in the standard form of http://[[user][:pass]@]host[:port]/. Per host proxies can also be specified by using the form @@ -363,7 +363,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - https + HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy options are the same as for http method and will also default to the options from the http method if they are not @@ -388,7 +388,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <host>::SslForceVersion is corresponding per-host option. - ftp + FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard form of ftp://[[user][:pass]@]host[:port]/. Per host proxies can also be specified by using the form @@ -427,7 +427,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; do not support RFC2428. - cdrom + CDROM URIs; the only setting for CDROM URIs is the mount point, cdrom::Mount which must be the mount point for the CDROM drive as specified in /etc/fstab. It is possible to provide @@ -438,13 +438,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; commands can be specified using UMount. - gpgv + GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv. gpgv::Options Additional options passed to gpgv. - CompressionTypes + List of compression types which are understood by the acquire methods. Files like Packages can be available in various compression formats. Per default the acquire methods can decompress bzip2, lzma @@ -472,7 +472,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; useable for local mirrors. - GzipIndexes + When downloading gzip compressed indexes (Packages, Sources, or Translations), keep them gzip compressed locally instead of unpacking @@ -481,7 +481,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Languages + The Languages subsection controls which Translation files are downloaded and in which order APT tries to display the Description-Translations. APT will try to display the first available Description in the Language which is listed at first. Languages can be defined with their @@ -574,7 +574,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; control the default behaviour. These are in the DSelect section. - Clean + Cache Clean mode; this value may be one of always, prompt, auto, pre-auto and never. always and prompt will remove all packages from the cache after upgrading, prompt (the default) does so conditionally. @@ -583,17 +583,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; action before downloading new packages. - options + The contents of this variable is passed to &apt-get; as command line options when it is run for the install phase. - Updateoptions + The contents of this variable is passed to &apt-get; as command line options when it is run for the update phase. - PromptAfterUpdate + If true the [U]pdate operation in &dselect; will always prompt to continue. The default is to prompt only on error. @@ -605,20 +605,20 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; in the DPkg section. - options + This is a list of options to pass to dpkg. The options must be specified using the list notation and each list item is passed as a single argument to &dpkg;. - Pre-InvokePost-Invoke + This is a list of shell commands to run before/after invoking &dpkg;. Like options this must be specified in list notation. The commands are invoked in order using /bin/sh, should any fail APT will abort. - Pre-Install-Pkgs + This is a list of shell commands to run before invoking dpkg. Like options this must be specified in list notation. The commands are invoked in order using /bin/sh, should any fail APT @@ -632,12 +632,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; command given to Pre-Install-Pkgs. - Run-Directory + APT chdirs to this directory before invoking dpkg, the default is /. - Build-options + These options are passed to &dpkg-buildpackage; when compiling packages, the default is to disable signing and produce all binaries. @@ -665,7 +665,7 @@ DPkg::ConfigurePending "true"; DPkg::TriggersPending "true"; - DPkg::NoTriggers + Add the no triggers flag to all dpkg calls (except the ConfigurePending call). See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the triggers when this flag is present unless it is explicitly called to do so in an extra call. @@ -673,7 +673,7 @@ DPkg::TriggersPending "true"; meaning: Previously these option only append --no-triggers to the configure calls to dpkg - now apt will add these flag also to the unpack and remove calls. - PackageManager::Configure + Valid values are "all", "smart" and "no". "all" is the default value and causes APT to configure all packages explicit. The "smart" way is it to configure only packages which need to be configured before @@ -684,20 +684,20 @@ DPkg::TriggersPending "true"; default as otherwise the system could end in an unconfigured status which could be unbootable! - DPkg::ConfigurePending + If this option is set apt will call dpkg --configure --pending to let dpkg handle all required configurations and triggers. This option is activated automatic per default if the previous option is not set to all, but deactivating could be useful if you want to run APT multiple times in a row - e.g. in an installer. In these sceneries you could deactivate this option in all but the last run. - DPkg::TriggersPending + Useful for smart configuration as a package which has pending triggers is not considered as installed and dpkg treats them as unpacked currently which is a dealbreaker for Pre-Dependencies (see debbugs #526774). Note that this will process all triggers, not only the triggers needed to configure this package. - PackageManager::UnpackAll + As the configuration can be deferred to be done at the end by dpkg it can be tried to order the unpack series only by critical needs, e.g. by Pre-Depends. Default is true and therefore the "old" method of ordering in various steps by everything. While both method @@ -705,7 +705,7 @@ DPkg::TriggersPending "true"; this method is very experimental and needs further improvements before becoming really useful. - OrderList::Score::Immediate + Essential packages (and there dependencies) should be configured immediately after unpacking. It will be a good idea to do this quite early in the upgrade process as these these configure calls require currently also DPkg::TriggersPending which @@ -788,7 +788,7 @@ DPkg::TriggersPending "true"; - Debug::Acquire::cdrom + @@ -799,7 +799,7 @@ DPkg::TriggersPending "true"; - Debug::Acquire::ftp + @@ -810,7 +810,7 @@ DPkg::TriggersPending "true"; - Debug::Acquire::http + @@ -821,7 +821,7 @@ DPkg::TriggersPending "true"; - Debug::Acquire::https + @@ -832,7 +832,7 @@ DPkg::TriggersPending "true"; - Debug::Acquire::gpgv + @@ -843,7 +843,7 @@ DPkg::TriggersPending "true"; - Debug::aptcdrom + @@ -854,7 +854,7 @@ DPkg::TriggersPending "true"; - Debug::BuildDeps + Describes the process of resolving build-dependencies in @@ -864,7 +864,7 @@ DPkg::TriggersPending "true"; - Debug::Hashes + Output each cryptographic hash that is generated by the @@ -874,7 +874,7 @@ DPkg::TriggersPending "true"; - Debug::IdentCDROM + Do not include information from statfs, @@ -885,7 +885,7 @@ DPkg::TriggersPending "true"; - Debug::NoLocking + Disable all file locking. For instance, this will allow @@ -896,7 +896,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAcquire + @@ -907,7 +907,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAcquire::Auth + Output status messages and errors related to verifying @@ -917,7 +917,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAcquire::Diffs + Output information about downloading and applying package @@ -928,7 +928,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAcquire::RRed + @@ -939,7 +939,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAcquire::Worker + @@ -950,7 +950,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAutoRemove + @@ -961,7 +961,7 @@ DPkg::TriggersPending "true"; - Debug::pkgDepCache::AutoInstall + Generate debug messages describing which packages are being @@ -975,7 +975,7 @@ DPkg::TriggersPending "true"; - Debug::pkgDepCache::Marker + Generate debug messages describing which package is marked @@ -997,7 +997,7 @@ DPkg::TriggersPending "true"; - Debug::pkgInitConfig + Dump the default configuration to standard error on @@ -1007,7 +1007,7 @@ DPkg::TriggersPending "true"; - Debug::pkgDPkgPM + When invoking &dpkg;, output the precise command line with @@ -1018,7 +1018,7 @@ DPkg::TriggersPending "true"; - Debug::pkgDPkgProgressReporting + Output all the data received from &dpkg; on the status file @@ -1028,7 +1028,7 @@ DPkg::TriggersPending "true"; - Debug::pkgOrderList + @@ -1040,7 +1040,7 @@ DPkg::TriggersPending "true"; - Debug::pkgPackageManager + @@ -1051,7 +1051,7 @@ DPkg::TriggersPending "true"; - Debug::pkgPolicy + @@ -1061,7 +1061,7 @@ DPkg::TriggersPending "true"; - Debug::pkgProblemResolver + @@ -1073,7 +1073,7 @@ DPkg::TriggersPending "true"; - Debug::pkgProblemResolver::ShowScores + Display a list of all installed packages with their calculated score @@ -1084,7 +1084,7 @@ DPkg::TriggersPending "true"; - Debug::sourceList + diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index f08f92b94..b6de039c6 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -287,6 +287,7 @@ Pin: release n=karmic* Pin-Priority: 990 + If a regular expression occurs in a Package field, the behavior is the same as if this regular expression were replaced with a list of all package names it matches. It is undecided whether @@ -295,7 +296,7 @@ pins first, so later specific pins override it. The pattern "*" in a Package field is not considered a glob() expression in itself. - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index e7e198d5a..9500330b4 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-05-20 18:22+0300\n" +"POT-Creation-Date: 2012-05-21 04:13+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -678,11 +678,6 @@ msgid "" "one of the commands below must be present." msgstr "" -#. type: Content of: -#: apt-cache.8.xml:48 -msgid "gencaches" -msgstr "" - #. type: Content of: #: apt-cache.8.xml:49 msgid "" @@ -690,9 +685,9 @@ msgid "" "implicitly by all commands needing this cache if it is missing or outdated." msgstr "" -#. type: Content of: -#: apt-cache.8.xml:53 -msgid "showpkg &synopsis-pkg;…" +#. type: Content of: