--- emerge.1.fresh 2006-01-08 16:53:44.000000000 +0100 +++ emerge.1 2006-01-08 19:06:08.000000000 +0100 @@ -7,7 +7,7 @@ [\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2file\fR | \fIclass\fR | \fIdependency\fR] ... .TP .BR emerge -\fB\-\-sync\fR | \fB\-\-info\fR | \fB\-\-version\fR +\fB\-\-sync\fR | \fB\-\-resume\fR | \fB\-\-info\fR | \fB\-\-version\fR .TP .BR emerge \fB\-\-search\fR \fIsomestring\fR @@ -47,7 +47,7 @@ [category/]\fR or \fBquickpkg /var/db/pkg//\fR. .TP .BR class -Package classes are a convenient shorthand for large groups of +A package \fIclass\fR is a convenient shorthand for a large group of packages. Two classes are currently supported: \fBsystem\fR and \fBworld\fR. \fBsystem\fR refers to a set of packages deemed necessary for your system to run properly. \fBworld\fR @@ -107,7 +107,7 @@ are having problems that this man page does not help resolve. .TP .BR \-\-info -This is a list of information to include in bug reports which aids the +Produces a list of information to include in bug reports, which aids the developers with fixing any problems you may report. \fBPlease include this information when submitting a bug report.\fR Expanded output can be obtained with the \fI\-\-verbose\fR option. @@ -119,7 +119,7 @@ package data. .TP .BR \-\-nocolor -Make sure none of the output from portage contains color. +Makes sure that the output of portage does not contain any color. .TP .BR "\-\-prune " (\fB\-P\fR) \fBWARNING: This action can remove important packages!\fR Tries to remove @@ -402,8 +402,9 @@ .TP .B [ebuild U\-] x11\-base/xfree\-4.3.0 [4.2.99.902] The \- represents lack of \fBSLOT\fR information about Xfree. This will occur -when the previous version emerged was injected (see \fBinject\fR for more info) -or very outdated (so old that \fBSLOT\fR did not exist). Either way, a newer version +when the previous version is listed in the \fBpackage.provided\fR file +(see \fBman portage\fR for more info) or very outdated (so old that +\fBSLOT\fR did not exist). Either way, a newer version of Xfree is availabe for your updating delight. .TP .B [ebuild U ] sys\-devel/distcc\-2.16 [2.13\-r1] \-gtk +ipv6* (\-selinux)