[patch] rearranges some words to make it display nicely in 80 columns

emergehelp.py-rewrite-a-bit.patch (text/plain), 3.93 KB, created by Benno Schulenberg on 2006-02-04 04:10:54 UTC

--- emergehelp.py.fresh	2006-02-04 12:57:59.000000000 +0100
+++ emergehelp.py	2006-02-04 13:00:47.000000000 +0100
@@ -57,7 +57,7 @@
 		print "                  binutils-2.11.90.0.7 and binutils-2.11.92.0.12.3-r1"
 		print
 		print "       "+green("--config")
-		print "              Runs package-specific operations that need to be executed after the"
+		print "              Runs package-specific operations that must be executed after an"
 		print "              emerge process has completed.  This usually entails configuration"
 		print "              file setup or other similar setups that the user may wish to run."
 		print
@@ -80,9 +80,9 @@
 		print "              run with the '--verbose' flag."
 		print
 		print "       "+green("--metadata")
-		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 "              Causes portage to process all the metacache files as is normally "
+		print "              done on the tail end of an rsync update using "+bold("emerge --sync")+"."
+		print "              This processing creates the cache database that portage uses for"
 		print "              pre-parsed lookups of package data."
 		print
 		print "       "+green("--prune")+" ("+green("-P")+" short option)"
@@ -100,16 +100,16 @@
 		print "              Rsync users should simply 'emerge --sync' to regenerate."
 		print
 		print "       "+green("--resume")
-		print "              Resumes the last merge operation. Can be treated just like a"
-		print "              regular merge as --pretend and other options work along side."
-		print "              'emerge --resume' only returns an error on failure. Nothing to"
-		print "              do exits with a message and a success condition."
+		print "              Resumes the last merge operation. It can be treated just like a"
+		print "              regular emerge: --pretend and other options work alongside it."
+		print "              'emerge --resume' only returns an error on failure. When there is"
+		print "              nothing to do, it exits with a message and a success condition."
 		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. Prepending"
-		print "              the expression with a '@' will cause the category to be included in"
-		print "              the search."
+		print "              portage tree. The search string is a regular expression."
+		print "              Prepending the expression with a '@' will cause the category to"
+		print "              be included in the search."
 		print "              A few examples:"
 		print "              "+bold("emerge search '^kde'")
 		print "                  list all packages starting with kde"
@@ -146,10 +146,10 @@
 		print
 		print turquoise("Options:")
 		print "       "+green("--alphabetical")
-		print "              When displaying USE and other flag output, combines the enabled and"
-		print "              disabled lists into one list and sorts the whole list"
-		print "              alphabetically.  With this option, output such as USE=\"dar -bar"
-		print "              -foo\" will instead be displayed as USE=\"-bar dar -foo\""
+		print "              When displaying USE and other flag output, combines the enabled"
+		print "              and disabled flags into a single list and sorts it alphabetically."
+		print "              With this option, output such as USE=\"dar -bar -foo\" will instead"
+		print "              be displayed as USE=\"-bar dar -foo\""
 		print
 		print "       "+green("--ask")+" ("+green("-a")+" short option)"
 		print "              before performing the merge, display what ebuilds and tbz2s will"