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 <gentoo-commits+bounces-318687-garchives=archives.gentoo.org@lists.gentoo.org>) id 1PrhsF-00082p-IC for garchives@archives.gentoo.org; Tue, 22 Feb 2011 02:21:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66A1D1C036; Tue, 22 Feb 2011 02:21:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 31C381C036 for <gentoo-commits@lists.gentoo.org>; Tue, 22 Feb 2011 02:21:03 +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 9C6981B40D6 for <gentoo-commits@lists.gentoo.org>; Tue, 22 Feb 2011 02:21:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 050C28006A for <gentoo-commits@lists.gentoo.org>; Tue, 22 Feb 2011 02:21:02 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <435c74008fff2c76437cbb59d7b6ad0f68dabcde.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: 435c74008fff2c76437cbb59d7b6ad0f68dabcde Date: Tue, 22 Feb 2011 02:21:02 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 42d537bd74aa68ece6c7a54e42de5984 commit: 435c74008fff2c76437cbb59d7b6ad0f68dabcde Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Feb 22 02:19:45 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Feb 22 02:19:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D435c7400 emerge.1: fix arg description more for bug 354137 --- man/emerge.1 | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index 311ce75..7b27089 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -89,8 +89,9 @@ to get around escaping problems. .BR "No action" If no action is specified, the action is to merge in the specified packages, satisfying any dependencies that they may have. The -arguments can be \fIebuilds\fR, \fItbz2s\fR, \fIsets\fR, or -\fIatoms\fR. \fBNote that you need to use the \-\-usepkg=20 +arguments can be \fIatoms\fR, \fIsets\fR, installed \fIfiles\fR, +\fIebuilds\fR, or \fItbz2s\fR. +\fBNote that you need to use the \-\-usepkg option if you want to install a tbz2\fR. The packages are added to the \fBworld\fR file at the end, so that they are considered for later updating.