[Aptitude-svn-commit] r4377 - in branches/aptitude-0.3/aptitude: . doc/en

[Daniel Burrows]

Author: dburrows
Date: Fri Sep 30 18:51:39 2005
New Revision: 4377

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
Log:
Correctly document the default resolver scores.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Sep 30 18:51:39 2005
@@ -2,6 +2,10 @@
 
 	* doc/en/aptitude.xml:
 
+	  Fix the documentation as regards the default resolver scores.
+
+	* doc/en/aptitude.xml:
+
 	  Document several undocumented configuration options.
 
 	* doc/en/aptitude.xml:

Modified: branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	(original)
+++ branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	Fri Sep 30 18:51:39 2005
@@ -8012,7 +8012,7 @@
 
 	    <seglistitem id='configProblemResolver-ExtraScore'>
 	      <seg><literal>Aptitude::ProblemResolver::ExtraScore</literal></seg>
-	      <seg><literal>5</literal></seg>
+	      <seg><literal>-1</literal></seg>
 
 	      <seg>
 		Any version of a package whose Priority is
@@ -8056,7 +8056,7 @@
 
 	    <seglistitem id='configProblemResolver-KeepScore'>
 	      <seg><literal>Aptitude::ProblemResolver::KeepScore</literal></seg>
-	      <seg><literal>-50</literal></seg>
+	      <seg><literal>0</literal></seg>
 	      <seg>
 		How much weight the problem resolver should give to
 		keeping a package in its current state, if that
@@ -8095,7 +8095,7 @@
 
 	    <seglistitem id='configProblemResolver-OptionalScore'>
 	      <seg><literal>Aptitude::ProblemResolver::OptionalScore</literal></seg>
-	      <seg><literal>5</literal></seg>
+	      <seg><literal>1</literal></seg>
 
 	      <seg>
 		Any version of a package whose Priority is
@@ -8115,7 +8115,7 @@
 
 	    <seglistitem id='configProblemResolver-PreserveManualScore'>
 	      <seg><literal>Aptitude::Problem-Resolver::PreserveManualScore</literal></seg>
-	      <seg><literal>40</literal></seg>
+	      <seg><literal>60</literal></seg>
 	      <seg>
 		How much weight the problem resolver should give to
 		preserving explicit user selections.
@@ -8188,7 +8188,7 @@
 
 	    <seglistitem id='configProblemResolver-StepScore'>
 	      <seg><literal>Aptitude::ProblemResolver::StepScore</literal></seg>
-	      <seg><literal>-10</literal></seg>
+	      <seg><literal>10</literal></seg>
 
 	      <seg>
 		How much to reward or penalize prospective solutions
@@ -8213,7 +8213,7 @@
 
 	    <seglistitem id='configProblemResolver-UpgradeScore'>
 	      <seg><literal>Aptitude::ProblemResolver::UpgradeScore</literal></seg>
-	      <seg><literal>-15</literal></seg>
+	      <seg><literal>0</literal></seg>
 	      <seg>
 		How much weight the problem resolver should give to
 		upgrading (or downgrading) a package to its candidate