From: Zac Medico Date: Fri, 29 Jan 2010 18:46:45 +0000 (-0000) Subject: Fix blocker example output to appear as emerge actually displays it. X-Git-Tag: v2.1.7.17~30 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=747d4528e49ac75df7043e83429754b376d4a168;p=portage.git Fix blocker example output to appear as emerge actually displays it. (trunk r15180) svn path=/main/branches/2.1.7/; revision=15242 --- diff --git a/man/emerge.1 b/man/emerge.1 index ac4ac6a5d..6cbda8096 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -583,7 +583,7 @@ When utilizing \fBemerge\fR with the \fB\-\-pretend\fR and \fB\-\-verbose\fR flags, the output may be a little hard to understand at first. This section explains the abbreviations. .TP -.B [blocks B ] app\-text/dos2unix (from pkg app\-text/hd2u\-0.8.0) +.B [blocks B ] app\-text/dos2unix ("app\-text/dos2unix" is blocking app\-text/hd2u\-0.8.0) Dos2unix is Blocking hd2u from being emerged. Blockers are defined when two packages will clobber each others files, or otherwise cause some form of breakage in your system. However, blockers usually do not need to be