diff options
| author | Daniel Burrows <dburrows@debian.org> | 2008-09-04 21:40:50 -0700 |
|---|---|---|
| committer | Daniel Burrows <dburrows@debian.org> | 2008-09-04 21:40:50 -0700 |
| commit | 9e0746f6adf1beb207491f04b50b0ebb25e3846b (patch) | |
| tree | 39fe81af58b1751698942096bfbb7ab1c1e28698 /doc/en/manpage.xml | |
| parent | 23f29251d99911149891ef030d7dc87ad4b52624 (diff) | |
| parent | ce5254bd15d791e9623e90fdc348c32a10584695 (diff) | |
| download | aptitude-9e0746f6adf1beb207491f04b50b0ebb25e3846b.tar.gz | |
Merge with head.
I took all the translation files from the head branch directly,
since that's where translation work is happening.
Diffstat (limited to 'doc/en/manpage.xml')
| -rw-r--r-- | doc/en/manpage.xml | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/doc/en/manpage.xml b/doc/en/manpage.xml index 97b39ea1..d6210bdf 100644 --- a/doc/en/manpage.xml +++ b/doc/en/manpage.xml @@ -966,9 +966,9 @@ i A texlive-latex-extra Conflicts textopo</screen> was passed or <link linkend='configAlways-Use-Safe-Resolver'><literal>Aptitude::Always-Use-Safe-Resolver</literal></link> is set to <literal>true</literal>), allow the dependency - resolver to install upgrades for packages even if <link - linkend='configSafe-Resolver-No-New-Upgrades'><literal>Aptitude::Safe-Resolver::No-New-Upgrades</literal></link> - is set. + resolver to install upgrades for packages regardless of + the value of <link + linkend='configSafe-Resolver-No-New-Upgrades'><literal>Aptitude::Safe-Resolver::No-New-Upgrades</literal></link>. </para> </listitem> </varlistentry> @@ -987,9 +987,8 @@ i A texlive-latex-extra Conflicts textopo</screen> linkend='configAlways-Use-Safe-Resolver'><literal>Aptitude::Always-Use-Safe-Resolver</literal></link> is set to <literal>true</literal>), allow the dependency resolver to install new packages. This option takes - effect even if <link - linkend='configSafe-Resolver-No-New-Installs'><literal>Aptitude::Safe-Resolver::No-New-Installs</literal></link> - is set. + effect regardless of the value of <link + linkend='configSafe-Resolver-No-New-Installs'><literal>Aptitude::Safe-Resolver::No-New-Installs</literal></link>. </para> </listitem> </varlistentry> @@ -1176,9 +1175,9 @@ libdbix-fulltextsearch-perl 0.73-10</screen> was passed or <link linkend='configAlways-Use-Safe-Resolver'><literal>Aptitude::Always-Use-Safe-Resolver</literal></link> is set to <literal>true</literal>), allow the dependency - resolver to install new packages even if <link - linkend='configSafe-Resolver-No-New-Upgrades'><literal>Aptitude::Safe-Resolver::No-New-Installs</literal></link> - is set. + resolver to install new packages regardless of the value + of <link + linkend='configSafe-Resolver-No-New-Upgrades'><literal>Aptitude::Safe-Resolver::No-New-Installs</literal></link>. </para> </listitem> </varlistentry> @@ -1199,9 +1198,8 @@ libdbix-fulltextsearch-perl 0.73-10</screen> linkend='configAlways-Use-Safe-Resolver'><literal>Aptitude::Always-Use-Safe-Resolver</literal></link> is set to <literal>true</literal>), forbid the dependency resolver from installing new packages. This option takes - effect even if <link - linkend='configSafe-Resolver-No-New-Installs'><literal>Aptitude::Safe-Resolver::No-New-Installs</literal></link> - is set. + effect regardless of the value of <link + linkend='configSafe-Resolver-No-New-Installs'><literal>Aptitude::Safe-Resolver::No-New-Installs</literal></link>. </para> <para> |