[Aptitude-devel] r3226 - in branches/aptitude-0.3/aptitude: . doc/en

[Daniel Burrows]

Author: dburrows
Date: Sun May  1 14:23:28 2005
New Revision: 3226

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
Log:
More resolver documentation.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun May  1 14:23:28 2005
@@ -1,5 +1,10 @@
 2005-05-01  Daniel Burrows  <dburrows@debian.org>
 
+	* doc/en/aptitude.xml:
+
+	  Add a brief overview of the command-line resolver interface to
+	  the documentation, and fix a minor typo.
+
 	* src/cmdline/cmdline_prompt.cc:
 
 	  Before, if the list of actions had not been modified by the time

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	Sun May  1 14:23:28 2005
@@ -1492,6 +1492,60 @@
       </para>
 
       <para>
+	If your request violates dependencies in a way that cannot be
+	trivially resolved, &aptitude; will ask you what to do:
+      </para>
+
+      <screen>The following packages are BROKEN:
+  libsdl1.2debian
+The following packages will be REMOVED:
+  libsdl1.2debian-all
+.
+.
+.
+The following actions will resolve these dependencies:
+
+Install the following packages:
+libsdl1.2debian-oss [1.2.7+1.2.8cvs20041007-4.1 (unstable)]
+
+Score is 19
+
+Accept this solution? [Y/n/q/?]</screen>
+
+      <para>
+	Typing <userinput>y</userinput> (or simply pressing
+	<keycap>enter</keycap>) will accept the proposed solution.
+	Typing <userinput>n</userinput> will display the <quote>next
+	best</quote> solution:
+      </para>
+
+      <screen>Accept this solution? [Y/n/q/?] <userinput>n</userinput>
+The following actions will resolve these dependencies:
+
+Install the following packages:
+libsdl1.2debian-alsa [1.2.7+1.2.8cvs20041007-4.1 (unstable,now)]
+
+Score is 19
+
+Accept this solution? [Y/n/q/?]</screen>
+
+      <para>
+	Typing <userinput>q</userinput> will <quote>give up</quote>
+	and quit the program immediately:
+      </para>
+
+      <screen>Accept this solution? [Y/n/q/?] q
+Abandoning all efforts to resolve these dependencies.
+Abort.</screen>
+
+      <para>
+	As with the main command-line prompt, you can perform a number
+	of additional actions, including manually altering the states
+	of packages, from the dependency resolution prompt.  Type
+	<userinput>?</userinput> to see a complete list.
+      </para>
+
+      <para>
 	For complete documentation of the command-line features of
 	&aptitude;, see <xref linkend='secReference'/>.
       </para>
@@ -6968,7 +7022,7 @@
 	    </seglistitem>
 
 	    <seglistitem id='configProblemResolver-BrokenScore'>
-	      <seg><literal>Aptitude::ProblemResolver::BrokenScore'></literal></seg>
+	      <seg><literal>Aptitude::ProblemResolver::BrokenScore</literal></seg>
 	      <seg><literal>-100</literal></seg>
 	      <seg>
 		How much to reward or penalize prospective solutions