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

Daniel Burrows dburrows at costa.debian.org
Thu Aug 18 18:58:34 UTC 2005


Author: dburrows
Date: Thu Aug 18 18:58:28 2005
New Revision: 3917

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
Log:
Start updating the documentation for the next version.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 18 18:58:28 2005
@@ -1,3 +1,10 @@
+2005-08-18  Daniel Burrows  <dburrows at debian.org>
+
+	* doc/en/aptitude.xml:
+
+	  Start updating the documentation for the next version: fix some
+	  comments in the tutorial, and fix some keystroke documentation.
+
 2005-08-17  Daniel Burrows  <dburrows at debian.org>
 
 	* src/generic/aptcache.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:

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	Thu Aug 18 18:58:28 2005
@@ -1072,23 +1072,26 @@
 	  basis to keep your system up-to-date.
 	</para>
 
-	<para>
-	  Sometimes, changing a package's state will cause dependency
-	  relationships to become unfulfilled; packages with
-	  unfulfilled dependencies are said to be
-	  <firstterm>broken</firstterm>.  &aptitude; will warn you
-	  when this happens, and explain why it occured.  For
-	  instance, here is what happens if I attempt to remove
-	  <systemitem>libkexif1</systemitem>:
-	</para>
+	<section>
+	  <title>Managing Broken Packages</title>
 
-	<screenshot>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata fileref='images/broken-snapshot.png' format='PNG'/>
-	    </imageobject>
+	  <para>
+	    Sometimes, changing a package's state will cause
+	    dependency relationships to become unfulfilled; packages
+	    with unfulfilled dependencies are said to be
+	    <firstterm>broken</firstterm>.  &aptitude; will warn you
+	    when this happens, and explain why it occured.  For
+	    instance, here is what happens if I attempt to remove
+	    <systemitem>libkexif1</systemitem>:
+	  </para>
 
-	    <textobject role='text'>
+	  <screenshot>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref='images/broken-snapshot.png' format='PNG'/>
+	      </imageobject>
+
+	      <textobject role='text'>
 <screen> Actions  Undo  Package  Search  Options  Views  Help
 f10: Menu  ?: Help  q: Quit  u: Update  g: Download/Install/Remove Pkgs
 aptitude 0.3.1       #Broken: 1   Will free 397kB of disk space
@@ -1112,48 +1115,48 @@
 
 [1/2] Suggest 1 keep
 e: Examine  !: Apply  .: Next  ,: Previous</screen>
-	    </textobject>
-	  </mediaobject>
-	</screenshot>
+	      </textobject>
+	    </mediaobject>
+	  </screenshot>
 
-	<para>
-	  As you can see, &aptitude; displays three indicators that
-	  something has gone wrong: first, the number of broken
-	  packages is displayed in the upper blue area; second, the
-	  lower half of the display changes to describe broken
-	  packages that are related to the currently highlighted
-	  package; third, a bar appears at the bottom of the screen
-	  with a suggestion on how to solve the problem.  To quickly
-	  find broken packages in the package list, you can press
-	  <keycap>b</keycap> or search for <literal>~b</literal>.
-	</para>
+	  <para>
+	    As you can see, &aptitude; displays three indicators that
+	    something has gone wrong: first, the number of broken
+	    packages is displayed in the upper blue area; second, the
+	    lower half of the display changes to describe broken
+	    packages that are related to the currently highlighted
+	    package; third, a bar appears at the bottom of the screen
+	    with a suggestion on how to solve the problem.  To quickly
+	    find broken packages in the package list, you can press
+	    <keycap>b</keycap> or search for <literal>~b</literal>.
+	  </para>
 
-	<para>
-	  To see more information about how &aptitude; thinks you can
-	  solve this problem, press <keycap>e</keycap>.  You can see
-	  more solutions by pressing <keycap>.</keycap>; once you have
-	  done so, you can return to solutions you skipped past by
-	  pressing <keycap>,</keycap>.  Finally, when you have found a
-	  solution that you are satisfied with, you can press
-	  <keycap>!</keycap> to execute it.
-	</para>
+	  <para>
+	    To see more information about how &aptitude; thinks you
+	    can solve this problem, press <keycap>e</keycap>.  You can
+	    see more solutions by pressing <keycap>.</keycap>; once
+	    you have done so, you can return to solutions you skipped
+	    past by pressing <keycap>,</keycap>.  Finally, when you
+	    have found a solution that you are satisfied with, you can
+	    press <keycap>!</keycap> to execute it.
+	  </para>
 
-	<para>
-	  For instance, in the following screen-shot, I have decided
-	  that I really want to remove
-	  <systemitem>libkexif1</systemitem>, even if it means that the
-	  <systemitem>digikam</systemitem> package must also be
-	  removed.  Pressing <keycap>!</keycap> or selecting the
-	  <quote>Apply</quote> button will flag
-	  <systemitem>digikam</systemitem> for removal, resolving the
-	  broken dependency.
-	</para>
+	  <para>
+	    For instance, in the following screen-shot, I have decided
+	    that I really want to remove
+	    <systemitem>libkexif1</systemitem>, even if it means that
+	    the <systemitem>digikam</systemitem> package must also be
+	    removed.  Pressing <keycap>!</keycap> or selecting the
+	    <quote>Apply</quote> button will flag
+	    <systemitem>digikam</systemitem> for removal, resolving
+	    the broken dependency.
+	  </para>
 
-	<screenshot>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata fileref='images/solution-dialog-snapshot.png' format='PNG'/>
-	    </imageobject>
+	  <screenshot>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref='images/solution-dialog-snapshot.png' format='PNG'/>
+	      </imageobject>
 
 	    <textobject role='text'>
 <screen> Actions  Undo  Package  Search  Options  Views  Help
@@ -1180,17 +1183,19 @@
 [2/2] Suggest 1 removal
 e: Examine  !: Apply  .: Next  ,: Previous</screen>
 	    </textobject>
-	  </mediaobject>
-	</screenshot>
+	    </mediaobject>
+	  </screenshot>
 
-	<para>
-	  If you do not resolve the situation, &aptitude; will try to
-	  fix things for you when you commit your selections by
-	  pressing <keycap>g</keycap>.  However, it is hard to
-	  automatically solve dependency problems, and you may not be
-	  happy with the results, so it is generally better to solve
-	  problems such as this before committing your selections.
-	</para>
+	  <para>
+	    If you do not resolve the situation, &aptitude; will try
+	    to fix things for you when you commit your selections by
+	    pressing <keycap>g</keycap>.  However, it is hard to
+	    automatically solve dependency problems, and you may not
+	    be happy with the results, so it is generally better to
+	    solve problems such as this before committing your
+	    selections.
+	  </para>
+	</section>
       </section>
 
       <section>
@@ -4796,6 +4801,14 @@
 	      </row>
 
 	      <row>
+		<entry><literal>CycleOrder</literal></entry>
+		<entry><literal>o</literal></entry>
+		<entry>
+		  Cycles through predefined arrangements of the display.
+		</entry>
+	      </row>
+
+	      <row>
 		<entry><literal>CyclePrev</literal></entry>
 		<entry><literal>f7</literal></entry>
 		<entry>
@@ -5339,6 +5352,26 @@
 	      </row>
 
 	      <row>
+		<entry><literal>SolutionActionAccept</literal></entry>
+		<entry><literal>a</literal></entry>
+		<entry>
+		  When viewing a solution, marks the currently
+		  selected action as "accepted" (only solutions
+		  containing it will be generated).
+		</entry>
+	      </row>
+
+	      <row>
+		<entry><literal>SolutionActionReject</literal></entry>
+		<entry><literal>r</literal></entry>
+		<entry>
+		  When viewing a solution, marks the currently
+		  selected action as "rejected" (only solutions not
+		  containing it will be generated).
+		</entry>
+	      </row>
+
+	      <row>
 		<entry><literal>ToggleExpanded</literal></entry>
 		<entry>entry</entry>
 		<entry>



More information about the Aptitude-svn-commit mailing list