summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeatrice Torracca <beatricet@libero.it>2012-05-28 14:57:56 +0800
committerDaniel Hartwig <mandyke@gmail.com>2012-05-28 14:59:20 +0800
commitb4e2e2c590ab4ed1b52fee9c86f9e44473825901 (patch)
tree1608a78dad047f75946c454c934801239ea1b9d9
parent0e9a704564d56e097d0f68149240845230ac8b7f (diff)
downloadaptitude-b4e2e2c590ab4ed1b52fee9c86f9e44473825901.tar.gz
Fix minor errors in document
* doc/en/aptitude.xml: - 2 instances of the command "versions" mispelled as "version" * doc/en/manpage.xml: - an error in the explanation of the dependency resolver costs: 2*removals + 3*upgrades should mean that three removals (2*3) equals 2 upgrades (3*2). Closes: #674675
-rw-r--r--NEWS2
-rw-r--r--doc/en/aptitude.xml4
-rw-r--r--doc/en/manpage.xml5
3 files changed, 7 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 41952884..7c1e19a5 100644
--- a/NEWS
+++ b/NEWS
@@ -62,6 +62,8 @@ earlier releases.
* [doc]: Add doctype headers to html docs.
* Italian translation (Closes: #674664)
+ * Fix minor errors in documentation. Thanks to Beatrice Torracca
+ (Closes: #674675)
- Translation updates:
diff --git a/doc/en/aptitude.xml b/doc/en/aptitude.xml
index cd9fa42b..749e8101 100644
--- a/doc/en/aptitude.xml
+++ b/doc/en/aptitude.xml
@@ -4641,8 +4641,8 @@ e: Examine !: Apply .: Next ,: Previous</screen>
other components. This can be used to control the
trade-offs that the resolver makes between costs. For
instance, a cost of <literal>2*removals +
- 3*upgrades</literal> says that two removals are exactly as
- <quote>bad</quote> as three upgrades. Solutions that
+ 3*upgrades</literal> says that three removals are exactly as
+ <quote>bad</quote> as two upgrades. Solutions that
contain four removals and one upgrade will be considered
equivalent to solutions containing one removal and three
upgrades, since both have a cost of eleven.
diff --git a/doc/en/manpage.xml b/doc/en/manpage.xml
index 9bc08555..f01ccaae 100644
--- a/doc/en/manpage.xml
+++ b/doc/en/manpage.xml
@@ -1191,7 +1191,8 @@ i A texlive-latex-extra Conflicts textopo</screen>
<listitem>
<para>
- This option causes <literal>aptitude search</literal> and <literal>aptitude version</literal> to
+ This option causes <literal>aptitude search</literal> and
+ <literal>aptitude versions</literal> to
output their results without any special formatting. In
particular: normally &aptitude; will add whitespace or
truncate search results in an attempt to fit its results
@@ -1273,7 +1274,7 @@ libdbix-fulltextsearch-perl 0.73-10</screen>
<para>
Specify the format which should be used to display
output from the <literal>search</literal> and
- <literal>version</literal> commands.
+ <literal>versions</literal> commands.
For instance, passing <quote><literal>%p %V %v</literal></quote>
for <replaceable>format</replaceable> will display a package's name,
followed by its currently installed version and its