From 183281fb9ebbce1adfc022a4b627ebc61e17eb0d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 6 Jun 2007 05:25:06 +0000 Subject: 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 --- man/emerge.1 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'man') 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. -- cgit v1.2.3-1-g7c22