From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 6 Aug 2007 19:50:58 +0000 (-0000)
Subject: Update emerge --help and --info docs. Thanks to Arfrever Frehtes Taifersar Arahesis... 
X-Git-Tag: v2.1.3.9~56
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=caaa74bcc384a7a506d21c18f763b77ffef50cc6;p=portage.git

Update emerge --help and --info docs. Thanks to Arfrever Frehtes Taifersar Arahesis in bug #137483. (trunk r7583)

svn path=/main/branches/2.1.2/; revision=7584
---

diff --git a/man/emerge.1 b/man/emerge.1
index 203fa1eb6..69c5abb84 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -7,13 +7,16 @@ emerge \- Command\-line interface to the Portage system
 [\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2file\fR | \fIset\fR | \fIatom\fR] ...
 .TP
 .BR emerge
-\fB\-\-sync\fR | \fB\-\-info\fR | \fB\-\-version\fR
+\fB\-\-sync\fR | \fB\-\-version\fR
+.TP
+.BR emerge
+\fB\-\-info\fR [\fIatom\fR]
 .TP
 .BR emerge
 \fB\-\-search\fR \fIsomestring\fR
 .TP
 .BR emerge
-\fB\-\-help\fR [\fB\-\-system\fR | \fB\-\-config\fR | \fB\-\-sync\fR]
+\fB\-\-help\fR [\fBsystem\fR | \fBworld\fR | \fB\-\-sync\fR]
 .SH "DESCRIPTION"
 \fBemerge\fR is the definitive command\-line interface to the Portage
 system.  It is primarily used for installing packages, and \fBemerge\fR
diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index a9acac607..55171c16b 100644
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.py
@@ -13,7 +13,7 @@ def shorthelp():
 	print "   "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] < "+turquoise("system")+" | "+turquoise("world")+" >"
 	print "   "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >"
 	print "   "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]"
-	print "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("world")+" | "+green("config")+" | "+green("--sync")+" ] "
+	print "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("world")+" | "+green("--sync")+" ] "
 	print bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhikKlnNoOpqPsStuvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
 	print      "                                          [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" >  ] [ "+green("--columns")+" ]"
 	print      "                                     [ "+green("--reinstall ")+turquoise("changed-use")+" ] ["+green("--nospinner")+"]"