summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-08-06 19:49:23 +0000
committerZac Medico <zmedico@gentoo.org>2007-08-06 19:49:23 +0000
commit5621acc34ed09d5fa485987f5ae39c63b87c3bac (patch)
tree91da0b9a694d61f7c51906e0f2f646002a3c4156
parent9b612eed370b12ee3b69691e77a5e9747375896a (diff)
downloadportage-5621acc34ed09d5fa485987f5ae39c63b87c3bac.tar.gz
portage-5621acc34ed09d5fa485987f5ae39c63b87c3bac.tar.bz2
portage-5621acc34ed09d5fa485987f5ae39c63b87c3bac.zip
Update emerge --help and --info docs. Thanks to Arfrever Frehtes Taifersar Arahesis in bug #137483.
svn path=/main/trunk/; revision=7583
-rw-r--r--man/emerge.17
-rw-r--r--pym/emerge/help.py2
2 files changed, 6 insertions, 3 deletions
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/emerge/help.py b/pym/emerge/help.py
index bbb17abe2..ee0ba19ee 100644
--- a/pym/emerge/help.py
+++ b/pym/emerge/help.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")+"]"