update search docs

svn path=/main/trunk/; revision=3877

diff --git a/man/emerge.1 b/man/emerge.1
index 7773fdffaa68b4381bcbe27de87f6ddc9f15e381..f27e6c0a2642f27b66457d6a92337d6a1f67025a 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -152,14 +152,15 @@ to do, then portage will exit with a message and a success condition.
 .TP
 .BR "\-\-search " (\fB\-s\fR)
 Searches for matches of the supplied string in the portage tree.
-The \-\-search string is a regular expression.  For example, \fBemerge
-\-\-search "^kde"\fR searches for any package whose name starts with "kde";
-\fBemerge \-\-search "gcc$"\fR searches for any package that ends with
-"gcc"; \fBemerge \-\-search "office"\fR searches for any package that
-contains the word "office".  If you want to include the category into the
-search string, prepend an @: \fBemerge --search "@^dev-java.*jdk"\fR. 
-If you want to search the package descriptions as well, use the
-\fB\-\-searchdesc\fR action.
+By default emerge uses a case-insensitive simple search, but you can 
+enable a regular expression search by prefixing the search string with %.
+For example, \fBemerge \-\-search "%^kde"\fR searches for any package whose 
+name starts with "kde"; \fBemerge \-\-search "%gcc$"\fR searches for any 
+package that ends with "gcc"; \fBemerge \-\-search "office"\fR searches for 
+any package that contains the word "office".  If you want to include the 
+category into the search string, prepend an @: \fBemerge --search 
+"%@^dev-java.*jdk"\fR. If you want to search the package descriptions as well, 
+use the \fB\-\-searchdesc\fR action.
 .TP
 .BR "\-\-searchdesc " (\fB\-S\fR)
 Matches the search string against the description field as well as

diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index ff6c4e6c8d909dedc5a4fb8ca14560bab3952574..9b1c9032aefdb29056ce808c2a19bdfe0be09db3 100644 (file)
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.py
@@ -107,15 +107,19 @@ def help(myaction,myopts,havecolor=1):
                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. By default emerge uses a case-insensitive simple "
+               print "              search, but you can enable a regular expression search by "
+               print "              prefixing the search string with %%."
                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 "              "+bold("emerge --search libc")
+               print "                  list all packages that contain libc in their name"
+               print "              "+bold("emerge --search '%^kde'")
                print "                  list all packages starting with kde"
-               print "              "+bold("emerge search 'gcc$'")
+               print "              "+bold("emerge --search '%gcc$'")
                print "                  list all packages ending with gcc"
-               print "              "+bold("emerge search @^dev-java.*jdk")
+               print "              "+bold("emerge --search '%@^dev-java.*jdk'")
                print "                  list all available Java JDKs"
                print
                print "       "+green("--searchdesc")+" ("+green("-S")+" short option)"