--- man/emaint.1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/man/emaint.1 b/man/emaint.1 index 6b8fdf9..fc47439 100644 --- a/man/emaint.1 +++ b/man/emaint.1 @@ -5,7 +5,7 @@ emaint \- performs package managment related system health checks and maintenanc .BR emaint [\fIoptions\fR] [\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \ -\fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR] +\fBmerges\fR | \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR] .SH DESCRIPTION The emaint program provides a command line interface to package management health checks and maintenance. @@ -31,6 +31,9 @@ Clean out old logs from the \fBPORT_LOGDIR\fR using the command See the \fBmake.conf\fR(5) man page for additional information as well as enabling the \fB'clean-logs'\fR feature in emerge to do this automatically. .TP +.BR merges +Scan for failed merges and attempt to fix found failed merges. +.TP .BR movebin Perform package move updates for binary packages located in \fBPKGDIR\fR. .TP @@ -82,6 +85,7 @@ than rsync. Please report bugs via http://bugs.gentoo.org/ .SH AUTHORS .nf +Pavel Kazakov <[email protected]> Mike Frysinger <[email protected]> Brian Dolbec <[email protected]> .fi @@ -92,6 +96,10 @@ Contains a list of all user\-specified packages. .TP .B /var/lib/portage/config Contains the paths and md5sums of all the config files being tracked. +.TP +.B /var/lib/portage/failed-merges +Contains the packages and timestamps of any failed merges being cleaned from +the system, and to be re-emerged. .SH "SEE ALSO" .BR emerge (1), .BR portage (5) -- 2.0.5
