[Darwinfiles-cvs] portage/man etc-update.1,NONE,1.1 ebuild.5,1.1.1.1,1.2 emerge.1,1.1.1.1,1.2

[<ji...@us...>]

Update of /cvsroot/darwinfiles/portage/man
In directory usw-pr-cvs1:/tmp/cvs-serv31821

Modified Files:
	ebuild.5 emerge.1 
Added Files:
	etc-update.1 
Log Message:
Merged with portage-2.0.36

--- NEW FILE: etc-update.1 ---
.TH etc-update "1" "March 2002" "gentoolkit 0.1.4" 
.SH NAME
etc-update \- manual page for the etc-update program, a program that traverses
your /etc directory, looking for suitable config file updates
.SH SYNOPSIS
.B etc-update
.SH DESCRIPTION
.I etc-update
is supposed to be run after merging a new package, to see if
there are updates to the configuration files in /etc. 
If a new configuration file will override an old one, 
.I etc-update 
will prompt the user for a decision.
.PP
.I etc-update
will check all directories in \fI/etc/make.global\fR's \fICONFIG_PROTECT\fR variable.
.SH OPTIONS 
.TP
None.
.SH AUTHORS
Jochem Kossen and Leo Lipelis, 2002: etc-update
.br
Karl Trygve Kalleberg <ka...@ge...>, 2002: man page, fixes
.SH "SEE ALSO"
ebuild(5) 
.TP
The \fI/usr/sbin/lintool\fR script. 

Index: ebuild.5
===================================================================
RCS file: /cvsroot/darwinfiles/portage/man/ebuild.5,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2

Index: emerge.1
===================================================================
RCS file: /cvsroot/darwinfiles/portage/man/emerge.1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** emerge.1	11 Aug 2002 02:09:33 -0000	1.1.1.1
--- emerge.1	8 Sep 2002 16:19:46 -0000	1.2
***************
*** 1,3 ****
! .TH "emerge" "1" "July 21, 2002" "portage 2.0.27" ""
  .SH "NAME"
  emerge \- Command\-line interface to the Portage system
--- 1,3 ----
! .TH "emerge" "1" "July 21, 2002" "portage 2.0.36" ""
  .SH "NAME"
  emerge \- Command\-line interface to the Portage system
***************
*** 195,198 ****
--- 195,204 ----
  example, \fBUSE="\-x \-gnome" emerge mc\fR will emerge mc with
  those USE settings.
+ .LP
+ If \fBemerge --update system\fR or \fB emerge --update world\fR
+ fail with an error message, it may be that an ebuild uses some
+ newer feature not present in this version of \fBemerge\fR.  You
+ can use \fBemerge --update portage\fR to upgrade to the lastest
+ version, which should support any necessary new features.
  .SH "SEE ALSO"
  \fBebuild(1) ebuild(5) make.defaults(5) make.conf(5)\fR