Re: [gentoo-portage-dev] [PATCH] man/emaint.1: Add entry about the merges module

[Brian Dolbec]

On Sat, 28 Feb 2015 07:50:16 -0800
Pavel Kazakov <nullishzero@g.o> wrote:

> ---
>  man/emaint.1 | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/man/emaint.1 b/man/emaint.1
> index 6b8fdf9..e9cfb8f 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 <nullishzero@g.o>
>  Mike Frysinger <vapier@g.o>
>  Brian Dolbec <dolsen@g.o>
>  .fi

You forgot to add the merges tracking file to the FILES section

-- 
Brian Dolbec <dolsen>