From 87150d1e5f18fc63eced612195a284b4f92dca57 Mon Sep 17 00:00:00 2001 From: Nicholas Jones Date: Mon, 27 Sep 2004 05:44:05 +0000 Subject: Lock fix, execv fix, doc cleanup. --- man/emerge.1 | 9 +++++---- man/make.conf.5 | 6 +----- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'man') diff --git a/man/emerge.1 b/man/emerge.1 index 171ae12..4e19d7b 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -141,7 +141,7 @@ user, then you are a 'rsync user' :). Rsync users should simply run users may find it convenient to run \fBemerge metadata\fR to rebuild the cache as portage does at the end of a sync operation. .TP -.BR "search " (\fB\-s\fR) +.BR search (\fB\-s\fR) Searches for matches of the supplied string in the portage tree. The search string is a regular expression. For example, \fBemerge search "^kde"\fR searches for any package that starts with "kde"; @@ -157,7 +157,7 @@ tree will be erased\fR. Except for in special circumstances, this uses \fBrsync\fR to do the update. See \fBmake.conf\fR(5)'s description of PORTDIR_OVERLAY for a method to avoid deletions. .TP -.BR "unmerge " (\fB\-C\fR) +.BR unmerge (\fB\-C\fR) \fBWARNING: This action can remove important packages!\fR Removes all matching packages. This does no checking of dependencies, so it may remove packages necessary for the proper operation of your @@ -244,7 +244,8 @@ are having problems that this man page does not help resolve. .TP .BR "\-\-newuse" Tells emerge to include installed packages where USE flags have changed -since installation. +since compilation. An asterisk mark where a USE flag has changed since +the package was compiled. .TP .BR "\-\-noconfmem" Causes portage to disregard merge records indicating that a config file @@ -545,4 +546,4 @@ Phil Bordelon .br Mike Frysinger .SH "CVS HEADER" -$Id: emerge.1,v 1.60 2004/09/17 00:17:10 vapier Exp $ +$Id: emerge.1,v 1.61 2004/09/27 05:44:05 carpaski Exp $ diff --git a/man/make.conf.5 b/man/make.conf.5 index 452e933..2324d82 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -247,10 +247,6 @@ Defines if color should be disabled by default. .br Defaults to false. .TP -\fBPKG_TMPDIR\fR = \fI[path]\fR -\fIemerge\fR uses this dir to extract a .tbz2 package before the -files get merged to the live filesystem. -.TP \fBPKGDIR\fR = \fI[path]\fR Defines the location where created .tbz2 binary packages will be stored. .br @@ -383,4 +379,4 @@ Nicholas Jones .br Mike Frysinger .SH "CVS HEADER" -$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/man/make.conf.5,v 1.42 2004/09/26 10:44:31 carpaski Exp $ +$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/man/make.conf.5,v 1.43 2004/09/27 05:44:05 carpaski Exp $ -- cgit v1.2.3-65-gdbad