merge man page changes from trunk rev 2365

svn path=/main/branches/prefix/; revision=2367

diff --git a/man/ebuild.1 b/man/ebuild.1
index f82d1531fc222e11cf85da087c6a1065784912b3..d8e55235531d8ccf24f7d364c0b48a697cbb1093 100644 (file)
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -64,6 +64,11 @@ Creates a digest file for the package in
 md5sum's of all the files found in the SRC_URI.  If the fetched source
 of the package is corrupt/bogus in some way, the md5sum will catch this.
 .TP
+.BR manifest
+Updates the manifest file for the package.  This performs the second half
+of the digest command, creating md5sums for the files in the files
+directory as well as the ebuild.
+.TP
 .BR unpack
 Extracts the sources to a subdirectory in the \fIbuild directory\fR
 (BUILD_PREFIX) by running the \fIsrc_unpack()\fR function in the ebuild

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1d497a6d3368c4509504c7dc9ca47fe53242ef25..08b787a56eb723be8c57daa636e32620dd05c625 100644 (file)
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -238,7 +238,7 @@ multiple Atoms and be nested to an infinite depth.
 To include the jpeg library when the user has jpeg in \fBUSE\fR, simply use the
 following syntax:
 .br
-.B jpeg? ( media-libs/jpeg)
+.B jpeg? ( media-libs/jpeg )
 .TP
 .B !usevar? ( Atom )
 If you want to include a package only if the user does not have a certain option

diff --git a/man/emaint.1 b/man/emaint.1
new file mode 100644 (file)
index 0000000..bae527b
--- /dev/null
+++ b/man/emaint.1
@@ -0,0 +1,30 @@
+.TH "EMAINT" "1" "Nov 2005" "Portage 2.0.53" "Portage"
+.SH NAME
+emaint \- updates environment settings automatically
+.SH SYNOPSIS
+.BR emaint
+[\fIoptions\fR]
+[\fBall\fR | \fBworld\fR]
+.SH DESCRIPTION
+.B emaint
+checks for and fixes problems in the portage \fIworld\fR file.
+.SH OPTIONS 
+.TP
+.B \-c, \-\-check
+Check for any problems that may exist.
+.TP
+.B \-f, \-\-fix
+Fix any problems that may exist.
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.SH AUTHORS
+.nf
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "FILES"
+.TP
+.B /var/lib/portage/world
+Contains a list of all user\-specified packages.
+.SH "SEE ALSO"
+.BR emerge (1),
+.BR portage (5)

diff --git a/man/emerge.1 b/man/emerge.1
index c6eb388154cc2873ecc0fedb5c3897a9c5807175..18110f7b93cc49c4720d1e919fac801ea8974ec0 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -111,9 +111,6 @@ tail end of an rsync update using \fBemerge \-\-sync\fR.  The processing
 creates the cache database that portage uses for pre\-parsed lookups of 
 package data.
 .TP
-.BR \-\-nocolor
-Make sure none of the output from portage contains color.
-.TP
 .BR "\-\-prune " (\fB\-P\fR)
 \fBWARNING: This action can remove important packages!\fR  Tries to remove 
 all but the last version installed.  Since the command currently does not 
@@ -157,6 +154,11 @@ all matching packages.  This does no checking of dependencies, so
 it may remove packages necessary for the proper operation of your
 system.  Its arguments can be \fIebuilds\fR, \fIclasses\fR, or
 \fIdependencies\fR \-\- see \fB\-\-clean\fR above for examples.
+.TP
+.BR "\-\-config "
+Run package specific actions needed to  be  executed  after  the
+emerge  process  has completed.  This usually entails configuration
+file setup or other similar setups that the user  may  wish to run.
 .SH "OPTIONS"
 .TP
 .BR "\-\-ask " (\fB\-a\fR)
@@ -241,6 +243,9 @@ Tells emerge to include installed packages where USE flags have changed since
 compilation.  An asterisk marks when a USE flag has changed since the package 
 was compiled.
 .TP
+.BR \-\-nocolor
+Make sure none of the output from portage contains color.
+.TP
 .BR "\-\-noconfmem"
 Causes portage to disregard merge records indicating that a config file
 inside of a \fBCONFIG_PROTECT\fR directory has been merged already.  Portage

diff --git a/man/repoman.1 b/man/repoman.1
index b603aebf2fc8576f017cb2b00a3bac2a1340c421..dd4155da50f70a55bed017a885ae5802ddb3dcdd 100644 (file)
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -106,6 +106,11 @@ An error occured while generating the cache entry.  This typically means the ebu
 .BR ebuild.output
 A simple sourcing of the ebuild produces output.  This breaks ebuild policy.
 .TP
+.BR IUSE.invalid
+The ebuild contains a useflag in IUSE that is not in use.desc or 
+use.local.desc.  You should add a description of the USE flag prior to 
+commiting the ebuild.
+.TP
 .BR KEYWORDS.missing
 The ebuild does not have a KEYWORDS variable.
 .TP
@@ -122,6 +127,7 @@ Please report bugs via http://bugs.gentoo.org/
 .SH AUTHORS
 .nf
 Daniel Robbins <drobbins@gentoo.org>
+Saleem Abdulrasool <compnerd@gentoo.org>
 .fi
 .SH "SEE ALSO"
 .BR emerge (1)