From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PmtfC-0005Ll-Mt for garchives@archives.gentoo.org; Tue, 08 Feb 2011 19:55:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACFA6E0778; Tue, 8 Feb 2011 19:55:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 77D33E0778 for ; Tue, 8 Feb 2011 19:55:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D17F81B40C8 for ; Tue, 8 Feb 2011 19:55:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4484D8006A for ; Tue, 8 Feb 2011 19:55:41 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <88249c4a47c0354724f1d7e387c1695e4953e2d6.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/ X-VCS-Repository: proj/portage X-VCS-Files: man/emerge.1 X-VCS-Directories: man/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 88249c4a47c0354724f1d7e387c1695e4953e2d6 Date: Tue, 8 Feb 2011 19:55:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: ecd676281b8eeb539774b5dfe9d5a4c7 commit: 88249c4a47c0354724f1d7e387c1695e4953e2d6 Author: Zac Medico gentoo org> AuthorDate: Tue Feb 8 19:52:03 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 8 19:52:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D88249c4a emerge.1: clarify docs for package arguments This will fix bug #354137. --- man/emerge.1 | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index 5a18a9c..42b26cd 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -28,8 +28,9 @@ and binary packages, and it can be used to create binar= y packages for distribution. .SH "EBUILDS, TBZ2S, SETS AND ATOMS" \fBemerge\fR primarily installs packages. You can specify -packages to install in one of four main ways: an \fIebuild\fR, -a \fItbz2file\fR, a \fIset\fR, or an \fIatom\fR. +packages to install in five possible ways: an \fIatom\fR, +a \fIset\fR, an installed \fIfile\fR, an \fIebuild\fR, or +a \fItbz2file\fR. .LP .TP .BR ebuild @@ -52,8 +53,9 @@ A \fItbz2file\fR must be a valid .tbz2 created with \fB= ebuild .TP .BR file A \fIfile\fR must be a file or directory that has been installed by one = or -more packages. For directories that are owned by multiple packages, all -owning packages to be selected. See the portageq(1) owners command if yo= u +more packages. If an absolute path is not used, then it must begin with +either "./" or "../". For directories that are owned by multiple package= s, all +owning packages will be selected. See the portageq(1) owners command if = you would like to query the owners of one or more files or directories. .TP .BR set