--- emerge.1.orig	2003-05-20 11:36:48.000000000 +0200
+++ emerge.1	2003-06-05 14:42:34.000000000 +0200
@@ -170,6 +170,15 @@
 packages is to use \fBquickpkg\fR which creates a tbz2 from the
 live filesystem.
 .TP
+\fB\-\-buildpkgonly\fR (\fB\-B\fR)
+Creates binary a binary package, but does not merge it to the system. This
+has the restriction that unsatisfied dependencies must not exist for the
+desired package as they cannot be used if they do not exist on the system.
+.TP
+\fB\-\-changelog\fR (\fB\-l\fR)
+When pretending, also display the ChangeLog entries for packages that will
+be upgraded.
+.TP
 \fB\-\-columns\fR
 Used along side \fI--pretend\fR to causes the package, new version,
 and old version to be displayed in an aligned format for easy cut\-n\-paste.
@@ -180,7 +189,7 @@
 causing it to output verbose debug information to stdout.
 \-\-debug is great for finding bash syntax errors.
 .TP
-\fB\-\-deep\fR
+\fB\-\-deep\fR (\fB\-D\fR)
 When used in conjunction with \fB\-\-update\fR, this flag forces
 \fBemerge\fR to consider the entire dependency tree of packages,
 instead of checking only the immediate dependencies of the packages.
@@ -204,7 +213,7 @@
 dealing with the same config multiple times. This flag will cause the
 file to always be merged.
 .TP
-\fB\-\-nodeps\fR
+\fB\-\-nodeps\fR (\fB\-O\fR)
 Merges specified packages without merging any dependencies.  Note that
 the build may fail if the dependencies aren't satisfied.
 .TP
@@ -234,21 +243,45 @@
 the printout, N = new, U = upgrading, R = replacing, B = blocked by
 an already installed package.
 .TP
+\fB\-\-quiet\fR (\fB\-q\fR)
+Effects vary, but the general outcome is a reduced or condensed output from
+portage's displays.
+.TP
+\fB\-\-resume\fR
+Resumes the last merge operation. Can be treated just like a regular merge
+as --pretend and other options work along side. 'emerge --resume' only
+returns an error on failure. Nothing to do exits with a message and a
+success condition.
+.TP
 \fB\-\-searchdesc\fR (\fB\-S\fR)
 Matches the search string against the description field as well as
 the package name.  \fBTake caution\fR as the descriptions are also
 matched as regular expressions.
 .TP
+\fB\-\-skipfirst\fR (\fB\-u\fR)
+This option is only valid in a resume situation. It removes the first
+package in the resume list so that a merge may continue in the presence of
+an uncorrectable or inconsequential error. This should only be used in cases
+where skipping the package will not result in failed dependencies.
+.TP
 \fB\-\-update\fR (\fB\-u\fR)
 Updates packages to the most recent version available.  \fBNote that\fR \-\-update \fBdoes not have full functionality yet\fR.  It will not automatically update dependencies of packages in the \fBworld\fR file, unless they too are in the \fBworld\fR file.
 .TP
+\fB\-\-upgradeonly\fR (\fB\-U\fR)
+Updates packages, but excludes updates that would result in a lower version of the package being installed. SLOTs are considered at a basic level.
+.TP
 \fB\-\-usepkg\fR (\fB\-k\fR) 
 Tells emerge to use binary packages (from $PKGDIR) if they are available, thus possibly avoiding some time\-consuming compiles. This option is useful for CD installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to have emerge "pull" binary packages from the CD in order to satisfy dependencies.
 .TP
+\fB\-\-usepkgonly\fR (\fB\-K\fR)
+Like --usepkg above, except this only allows the use of binary packages, and
+it will abort the emerge if the package is not available at the time of
+dependency calculation.
+.TP
 \fB\-\-verbose\fR (\fB\-v\fR)
 Tell emerge to run in verbose mode.  Currently this flag causes emerge to print out GNU info errors, if any.
 .TP
-\fB\-\-version\fR
+\fB\-\-version\fR (\fB\-V\fR)
 Displays the version number of \fBemerge\fR.  It cannot be used in
 conjunction with other options; the name and format of the action
 is a convention.