--- emergehelp.py.orig	2004-10-13 21:14:04.000000000 +0200
+++ emergehelp.py.orig	2004-10-13 21:31:57.000000000 +0200
@@ -13,7 +13,7 @@ 
 	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("config")+" | "+green("sync")+" ] "
+	print "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("world")+" | "+green("config")+" | "+green("sync")+" ] "
 	print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
 	print      "                                    ["+green("--columns")+"] ["+green("--nospinner")+"]"
 	print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--inject")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
@@ -73,7 +73,7 @@ 
 		print "              "+turquoise("caution when employing this feature.")
 		print
 		print "       "+green("--info")
-		print "              Displays important portage variables that will be exported to"
+		print "              Displays important Portage variables that will be exported to"
 		print "              ebuild.sh when performing merges. This information is useful"
 		print "              for bug reports and verification of settings. All settings in"
 		print "              make.{conf,globals,defaults} and the environment show up if"
@@ -87,9 +87,9 @@ 
 		print "              "+bold("emerge --inject sys-kernel/gentoo-sources-2.4.19")
 		print
 		print "       "+green("--metadata")
-		print "              Causes portage to process all the metacache files as is normally done"
+		print "              Causes Portage to process all the metacache files as is normally done"
 		print "              on the tail end of an rsync update using "+bold("emerge --sync")+". The"
-		print "              processing creates the cache database that portage uses for"
+		print "              processing creates the cache database that Portage uses for"
 		print "              pre-parsed lookups of package data."
 		print
 		print "       "+green("--prune")+" ("+green("-P")+" short option)"
@@ -101,14 +101,14 @@ 
 		print "              The argument format is the same as for the "+bold("--clean")+" action."
 		print
 		print "       "+green("--regen")
-		print "              Causes portage to check and update the dependency cache of all"
-		print "              ebuilds in the portage tree. This is not recommended for rsync"
+		print "              Causes Portage to check and update the dependency cache of all"
+		print "              ebuilds in the Portage tree. This is not recommended for rsync"
 		print "              users as rsync updates the cache using server-side caches."
 		print "              Rsync users should simply 'emerge --sync' to regenerate."
 		print
 		print "       "+green("--search")+" ("+green("-s")+" short option)"
 		print "              searches for matches of the supplied string in the current local"
-		print "              portage tree. The search string is a regular expression."
+		print "              Portage tree. The search string is a regular expression."
 		print "              A few examples: "
 		print "              "+bold("emerge search '^kde'")
 		print "                  list all packages starting with kde"
@@ -188,7 +188,7 @@ 
 		print "              displayed multiple mirrors per line, one line per file."
 		print
 		print "       "+green("--getbinpkg")+" ("+green("-g")+" short option)"
-		print "              Using the server and location defined in PORTAGE_BINHOST, portage"
+		print "              Using the server and location defined in PORTAGE_BINHOST, Portage"
 		print "              will download the information from each binary file there and it"
 		print "              will use that information to help build the dependency list. This"
 		print "              option implies '-k'. (Use -gK for binary-only merging.)"
@@ -246,7 +246,7 @@ 
 		print
 		print "       "+green("--quiet")+" ("+green("-q")+" short option)"
 		print "              Effects vary, but the general outcome is a reduced or condensed"
-		print "              output from portage's displays."
+		print "              output from Portage's displays."
 		print
 		print "       "+green("--resume")
 		print "              Resumes the last merge operation. Can be treated just like a"
@@ -303,10 +303,10 @@ 
 		print
 		print "       "+green("--verbose")+" ("+green("-v")+" short option)"
 		print "              Effects vary, but the general outcome is an increased or expanded"
-		print "              display of content in portage's displays."
+		print "              display of content in Portage's displays."
 		print
 		print "       "+green("--version")+" ("+green("-V")+" short option)"
-		print "              Displays the currently installed version of portage along with"
+		print "              Displays the currently installed version of Portage along with"
 		print "              other information useful for quick reference on a system. See"
 		print "              "+bold("emerge info")+" for more advanced information."
 		print
@@ -315,7 +315,7 @@ 
 		print bold("Usage: ")+turquoise("emerge")+" "+turquoise("--sync")
 		print
 		print "       'emerge --sync' tells emerge to update the Portage tree as specified in"
-		print "       The SYNC variable found in /etc/make.conf.  By default, SYNC instructs"
+		print "       the SYNC variable found in /etc/make.conf.  By default, SYNC instructs"
 		print "       emerge to perform an rsync-style update with rsync.gentoo.org."
 		#              Available"
 		#print "       sync methods are rsync and anoncvs.  To use anoncvs rather than rsync,"
@@ -323,29 +323,43 @@ 
 		#print "       /etc/make.conf.  If you haven't used anoncvs before, you'll be prompted"
 		#print "       for a password, which for cvs.gentoo.org is empty (just hit enter.)"
 		print
-		print "       'emerge-webrsync' exists as a helper app to emerge --sync, providing a"
-		print "       method to receive the entire portage tree as a tarball that can be"
-		print "       extracted and used. First time syncs would benefit greatly from this."
+		print "       The 'emerge-webrsync' script exists as a helper app to 'emerge --sync',"
+		print "       providing a method to receive the entire Portage tree as a tarball that"
+		print "       can be extracted and used.  This method is recommended for first-time"
+		print "       syncs."
 		print
 		print "       "+turquoise("WARNING:")
-		print "       If using our rsync server, emerge will clean out all files that do not"
-		print "       exist on it, including ones that you may have created."
+		print "       Upon syncing, emerge will clean out all files in your Portage tree"
+		print "       that do not exist on our rsync servers, including ones that you may"
+		print "       have created."
 		print
 	elif myaction=="system":
 		print
 		print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("system")
 		print
-		print "       \"emerge system\" is the Portage system update command.  When run, it"
-		print "       will scan the etc/make.profile/packages file and determine what"
+		print "       'emerge system' is the Portage system update command.  When run, it"
+		print "       will scan the /etc/make.profile/packages file and determine what"
 		print "       packages need to be installed so that your system meets the minimum"
 		print "       requirements of your current system profile.  Note that this doesn't"
 		print "       necessarily bring your system up-to-date at all; instead, it just"
 		print "       ensures that you have no missing parts.  For example, if your system"
 		print "       profile specifies that you should have sys-apps/iptables installed"
-		print "       and you don't, then \"emerge system\" will install it (the most"
-		print "       recent version that matches the profile spec) for you.  It's always a"
-		print "       good idea to do an \"emerge --pretend system\" before an \"emerge"
-		print "       system\", just so you know what emerge is planning to do."
+		print "       and you don't, then 'emerge system' will install it (the most recent"
+		print "       version that matches the profile spec) for you.  It's always a good"
+		print "       idea to do an 'emerge --pretend system' before an 'emerge system',"
+		print "       just so you know what emerge is planning to do."
+		print
+	elif myaction=="world":
+		print
+		print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("world")
+		print
+		print "       'emerge world' is the Portage command for completely updating your"
+		print "       system.  The normal procedure is to first do an 'emerge --sync' and"
+		print "       then an 'emerge --update --deep world'.  The first command brings your"
+		print "       local Portage tree up-to-date with the latest version information and"
+		print "       ebuilds.  The second command then rebuilds all packages for which newer"
+		print "       versions or newer ebuilds have become available since you last did a"
+		print "       sync and update."
 		print
 	elif myaction=="config":
 		outstuff=green("Config file management support (preliminary)")+"""