From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 6 Jun 2007 05:25:06 +0000 (-0000)
Subject: For bug #156536, update --resume docs to show that the resume history is capable... 
X-Git-Tag: v2.2_pre1~1288
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=183281fb9ebbce1adfc022a4b627ebc61e17eb0d;p=portage.git

For bug #156536, update --resume docs to show that the resume history is capable of storing two merge lists.

svn path=/main/trunk/; revision=6742
---

diff --git a/man/emerge.1 b/man/emerge.1
index aaed8651f..1a4aea020 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -144,9 +144,13 @@ the cache.  After a portage update, rsync users may find it convenient to run
 a sync operation.
 .TP
 .BR "\-\-resume"
-Resumes the last merge operation.  Please note that this operation
-will only return an error on failure.  If there is nothing for portage
-to do, then portage will exit with a message and a success condition.
+Resumes the most recent merge list that has been aborted due to an error.
+Please note that this operation will only return an error on failure.  If there
+is nothing for portage to do, then portage will exit with a message and a
+success condition. A resume list will persist until it has been completed in
+entirety or until another aborted merge list replaces it.  The resume history
+is capable of storing two merge lists.  After one resume list completes, it is
+possible to invoke \-\-resume once again in order to resume an older list.
 .TP
 .BR "\-\-search " (\fB\-s\fR)
 Searches for matches of the supplied string in the portage tree.
diff --git a/pym/emerge/help.py b/pym/emerge/help.py
index 7df9ee760..44dea9709 100644
--- a/pym/emerge/help.py
+++ b/pym/emerge/help.py
@@ -100,10 +100,15 @@ def help(myaction,myopts,havecolor=1):
 		print "              Rsync users should simply 'emerge --sync' to regenerate."
 		print
 		print "       "+green("--resume")
-		print "              Resumes the last merge operation. It can be treated just like a"
-		print "              regular emerge: --pretend and other options work alongside it."
-		print "              'emerge --resume' only returns an error on failure. When there is"
-		print "              nothing to do, it exits with a message and a success condition."
+		print "              Resumes the most recent merge list that has been aborted due to an"
+		print "              error. Please note that this operation will only return an error"
+		print "              on failure. If there is nothing for portage to do, then portage"
+		print "              will exit with a message and a success condition. A resume list"
+		print "              will persist until it has been completed in entirety or until"
+		print "              another aborted merge list replaces it. The resume history is"
+		print "              capable of storing two merge lists. After one resume list"
+		print "              completes, it is possible to invoke --resume once again in order"
+		print "              to resume an older list."
 		print
 		print "       "+green("--search")+" ("+green("-s")+" short option)"
 		print "              Searches for matches of the supplied string in the current local"