diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 35a396537..c9c0d49e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,7 +29,7 @@ apt (0.7.24) UNRELEASED; urgency=low a bit and improve the documentation for this option group. * doc/apt.conf.5.xml: - document the Acquire::http::Dl-Limit option - - try to be cristal clear about the usage of :: and {} (Closes: #503481) + - try to be crystal clear about the usage of :: and {} (Closes: #503481) * doc/apt-cache.8.xml: - clarify the note for the pkgnames command (Closes: #547599) * doc/apt.ent, all man pages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index cfc09ec1f..e752f9d27 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -100,7 +100,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para>The #clear command is the only way to delete a list or a complete scope. Reopening a scope or the ::-style described below will <emphasis>not</emphasis> - override previewsly written entries. Only options can be overridden by adressing a new + override previously written entries. Only options can be overridden by addressing a new value to it - lists and scopes can't be overridden, only cleared.</para> <para>All of the APT tools take a -o option which allows an arbitrary configuration @@ -108,7 +108,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; name (<literal>APT::Get::Assume-Yes</literal> 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 commandline.)</para> + on the command line.)</para> <para>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. @@ -254,7 +254,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para>The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</literal> which accepts integer values in kilobyte. The default value is 0 which deactivates - the limit and tries uses as much as possible of the bandwith (Note that this option implicit + the limit and tries uses as much as possible of the bandwidth (Note that this option implicit deactivates the download from multiple servers at the same time.)</para></listitem> </varlistentry> @@ -356,7 +356,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <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> - Note also that list entries specified on the commandline will be added at the end of the list + 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 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> @@ -498,12 +498,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; multiply calls of dpkg. Without further options dpkg will use triggers only in between his own run. Activating these options can therefore decrease the time needed to perform the install / upgrade. Note that it is intended to activate these options per default in the - future, but as it changes the way APT calling dpkg drastical it needs a lot more testing. + future, but as it changes the way APT calling dpkg drastically it needs a lot more testing. <emphasis>These options are therefore currently experimental and should not be used in productive environments.</emphasis> Also it breaks the progress reporting so all frontends will currently stay around half (or more) of the time in the 100% state while it actually configures all packages.</para> - <para>Note that it is not garanteed that APT will support these options or that these options will + <para>Note that it is not guaranteed that APT will support these options or that these options will not cause (big) trouble in the future. If you have understand the current risks and problems with these options, but are brave enough to help testing them create a new configuration file and test a combination of options. Please report any bugs, problems and improvements you encounter and make sure @@ -550,7 +550,7 @@ DPkg::TriggersPending "true";</literallayout></para> <varlistentry><term>PackageManager::UnpackAll</term> <listitem><para>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 verious steps by everything. While both method + and therefore the "old" method of ordering in various steps by everything. While both method were present in earlier APT versions the <literal>OrderCritical</literal> method was unused, so this method is very experimental and needs further improvements before becoming really useful. </para></listitem> @@ -560,7 +560,7 @@ DPkg::TriggersPending "true";</literallayout></para> 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 <literal>DPkg::TriggersPending</literal> which will run quite a few triggers (which maybe not needed). Essentials get per default a high score - but the immediate flag is relativly low (a package which has a Pre-Depends is higher rated). + but the immediate flag is relatively low (a package which has a Pre-Depends is higher rated). These option and the others in the same group can be used to change the scoring. The following example shows the settings with there default values. <literallayout>OrderList::Score { |