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

[Daniel Burrows]

Author: dburrows
Date: Fri Sep 30 18:48:58 2005
New Revision: 4376

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
Log:
Document more configuration options

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Sep 30 18:48:58 2005
@@ -2,6 +2,10 @@
 
 	* doc/en/aptitude.xml:
 
+	  Document several undocumented configuration options.
+
+	* doc/en/aptitude.xml:
+
 	  Typo fix.
 
 	* src/cmdline/cmdline_update.cc, src/generic/apt/download_update_manager.cc, src/ui.cc:

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:48:58 2005
@@ -7901,6 +7901,25 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configIgnore-Old-Tmp'>
+	      <seg><literal>Aptitude::Ignore-Old-Tmp</literal></seg>
+
+	      <seg><literal>false</literal></seg>
+
+	      <seg>
+		Old versions of &aptitude; created a directory
+		<filename>~/.aptitude/.tmp</filename> which is no
+		longer necessary.  If the directory exists and
+		<literal>Aptitude::Ignore-Old-Tmp</literal> is
+		<literal>true</literal>, &aptitude; will ask you
+		whether to remove this directory.  This option is
+		automatically set to <literal>true</literal> after you
+		reply.  On the other hand, if the directory does not
+		exist, this option is set to <literal>false</literal>
+		so that you will be notified if it reappears.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configKeepSuggests'>
 	      <seg><literal>Aptitude::Keep-Suggests</literal></seg>
 
@@ -7961,6 +7980,15 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configProblemResolver-BreakHoldScore'>
+	      <seg><literal>Aptitude::ProblemResolver::BreakHoldScore</literal></seg>
+	      <seg><literal>-300</literal></seg>
+	      <seg>
+		How much to reward or penalize solutions that change
+		the state of a held package.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configProblemResolver-BrokenScore'>
 	      <seg><literal>Aptitude::ProblemResolver::BrokenScore</literal></seg>
 	      <seg><literal>-100</literal></seg>
@@ -7973,6 +8001,15 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configProblemResolver-EssentialRemoveScore'>
+	      <seg><literal>Aptitude::ProblemResolver::EssentialRemoveScore</literal></seg>
+	      <seg><literal>-100000</literal></seg>
+	      <seg>
+		How much to reward or penalize solutions that remove
+		an Essential package.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configProblemResolver-ExtraScore'>
 	      <seg><literal>Aptitude::ProblemResolver::ExtraScore</literal></seg>
 	      <seg><literal>5</literal></seg>
@@ -8142,7 +8179,10 @@
 		value is large enough to accomodate commonly
 		encountered situations, while preventing the program
 		from <quote>blowing up</quote> if an overly
-		complicated problem is encountered.
+		complicated problem is encountered.  (note: this
+		applies only to command-line searches; in the visual
+		interface, the resolver will continue working until it
+		reaches a solution)
 	      </seg>
 	    </seglistitem>
 
@@ -8158,6 +8198,19 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configProblemResolver-UnfixedSoftScore'>
+	      <seg><literal>Aptitude::ProblemResolver::UnfixedSoftScore</literal></seg>
+	      <seg><literal>-200</literal></seg>
+	      <seg>
+		How much to reward or penalize leaving a Recommends
+		relationship unresolved.  This should typically be
+		less than RemoveScore, or &aptitude; will tend to
+		remove packages rather than leaving their
+		Recommendations unfixed.  See <xref
+		linkend='secResolver'/> for details.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configProblemResolver-UpgradeScore'>
 	      <seg><literal>Aptitude::ProblemResolver::UpgradeScore</literal></seg>
 	      <seg><literal>-15</literal></seg>
@@ -8327,6 +8380,17 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configDefault-Sorting'>
+	      <seg><literal>Aptitude::UI::Default-Sorting</literal></seg>
+	      <seg><literal>name</literal></seg>
+
+	      <seg>
+		The default sorting policy of package views.  See
+		<xref linkend='secSortingPolicy'/> for more
+		information.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configDescription-Visible-By-Default'>
 	      <seg><literal>Aptitude::UI::Description-Visible-By-Default</literal></seg>
 
@@ -8586,6 +8650,19 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='suppressReadOnlyWarning'>
+	      <seg><literal>Aptitude::Suppress-Read-Only-Warning</literal></seg>
+
+	      <seg><literal>false</literal></seg>
+
+	      <seg>
+		If this option is <literal>false</literal>, &aptitude;
+		will display a warning the first time that you attempt
+		to modify package states while the program is in
+		read-only mode.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configWarn-Not-Root'>
 	      <seg><literal>Aptitude::Warn-Not-Root</literal></seg>
 
@@ -8602,6 +8679,16 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configDebTags-Vocabulary'>
+	      <seg><literal>DebTags::Vocabulary</literal></seg>
+	      <seg><literal>/usr/share/debtags/vocabulary</literal></seg>
+	      <seg>
+		The location of the <literal>debtags</literal>
+		vocabulary file; used to load in the package tag
+		metadata.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configQuiet'>
 	      <seg><literal>Quiet</literal></seg>