Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: man/
Date: Tue, 22 Feb 2011 02:21:11
Message-Id: 435c74008fff2c76437cbb59d7b6ad0f68dabcde.zmedico@gentoo
1 commit: 435c74008fff2c76437cbb59d7b6ad0f68dabcde
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 22 02:19:45 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 22 02:19:45 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=435c7400
7
8 emerge.1: fix arg description more for bug 354137
9
10 ---
11 man/emerge.1 | 5 +++--
12 1 files changed, 3 insertions(+), 2 deletions(-)
13
14 diff --git a/man/emerge.1 b/man/emerge.1
15 index 311ce75..7b27089 100644
16 --- a/man/emerge.1
17 +++ b/man/emerge.1
18 @@ -89,8 +89,9 @@ to get around escaping problems.
19 .BR "No action"
20 If no action is specified, the action is to merge in the specified
21 packages, satisfying any dependencies that they may have. The
22 -arguments can be \fIebuilds\fR, \fItbz2s\fR, \fIsets\fR, or
23 -\fIatoms\fR. \fBNote that you need to use the \-\-usepkg
24 +arguments can be \fIatoms\fR, \fIsets\fR, installed \fIfiles\fR,
25 +\fIebuilds\fR, or \fItbz2s\fR.
26 +\fBNote that you need to use the \-\-usepkg
27 option if you want to install a tbz2\fR. The packages are added
28 to the \fBworld\fR file at the end, so that they are considered for
29 later updating.