diff --git a/src/doc/user/usermanual.sgml b/src/doc/user/usermanual.sgml
index d8ecc997..067a62c7 100644
--- a/src/doc/user/usermanual.sgml
+++ b/src/doc/user/usermanual.sgml
@@ -24,7 +24,7 @@
       Dockes</holder>
     </copyright>
 
-    <releaseinfo>$Id: usermanual.sgml,v 1.15 2006-09-08 09:02:47 dockes Exp $</releaseinfo>
+    <releaseinfo>$Id: usermanual.sgml,v 1.16 2006-09-11 14:22:15 dockes Exp $</releaseinfo>
 
     <abstract>
       <para>This document introduces full text search notions
@@ -423,10 +423,12 @@
       <title>Complex/advanced search</title>
 
       <para>The advanced search dialog has fields that will allow a more
-        refined search, looking for documents with all given words, a
-        given exact phrase, none of the given words, or a given file
+        refined search, looking for documents with all given elements, a
+        given exact phrase, none of the given elements, or a given file
         name (with wildcard expansion). All relevant fields will be
-        combined by an implicit AND clause.</para>
+        combined by an implicit AND clause. All fields except "Exact
+        phrase" can accept single words, or phrases enclosed in double
+        quotes.</para>
 
       <para>It will let you search for documents of specific mime
         types (ie: only <literal>text/plain</literal>, or
diff --git a/src/qtgui/advsearch.ui b/src/qtgui/advsearch.ui
index 99fb7f85..c3e0c0d2 100644
--- a/src/qtgui/advsearch.ui
+++ b/src/qtgui/advsearch.ui
@@ -46,7 +46,7 @@
                                 <string>Search for files&lt;br&gt;having all of:</string>
                             </property>
                             <property name="toolTip" stdset="0">
-                                <string>All non blank fields will be combined with AND conjunctions</string>
+                                <string>All non blank fields will be combined with AND conjunctions. &lt;br&gt;All fields except "exact phrase" can accept a mix of simple words, and phrases enclosed in double quotes.</string>
                             </property>
                         </widget>
                         <widget class="QLayoutWidget">
@@ -65,13 +65,22 @@
                                         <cstring>andWordsTL</cstring>
                                     </property>
                                     <property name="text">
-                                        <string>All these words</string>
+                                        <string>All of these</string>
                                     </property>
                                 </widget>
                                 <widget class="QLineEdit" row="0" column="1">
                                     <property name="name">
                                         <cstring>andWordsLE</cstring>
                                     </property>
+                                    <property name="minimumSize">
+                                        <size>
+                                            <width>300</width>
+                                            <height>0</height>
+                                        </size>
+                                    </property>
+                                    <property name="toolTip" stdset="0">
+                                        <string>Enter words, and/or quoted phrases.</string>
+                                    </property>
                                 </widget>
                                 <widget class="QLabel" row="1" column="0">
                                     <property name="name">
@@ -85,45 +94,57 @@
                                     <property name="name">
                                         <cstring>phraseLE</cstring>
                                     </property>
+                                    <property name="toolTip" stdset="0">
+                                        <string>Enter words.</string>
+                                    </property>
                                 </widget>
                                 <widget class="QLabel" row="2" column="0">
                                     <property name="name">
                                         <cstring>orWordsTL</cstring>
                                     </property>
                                     <property name="text">
-                                        <string>Any of these words</string>
+                                        <string>Any of these</string>
                                     </property>
                                 </widget>
                                 <widget class="QLineEdit" row="2" column="1">
                                     <property name="name">
                                         <cstring>orWordsLE</cstring>
                                     </property>
+                                    <property name="toolTip" stdset="0">
+                                        <string>Enter words, and/or quoted phrases.</string>
+                                    </property>
                                 </widget>
                                 <widget class="QLabel" row="3" column="0">
                                     <property name="name">
                                         <cstring>orWords1TL</cstring>
                                     </property>
                                     <property name="text">
-                                        <string>Any of these words</string>
+                                        <string>Any of these</string>
                                     </property>
                                 </widget>
                                 <widget class="QLineEdit" row="3" column="1">
                                     <property name="name">
                                         <cstring>orWords1LE</cstring>
                                     </property>
+                                    <property name="toolTip" stdset="0">
+                                        <string>Enter words, and/or quoted phrases.</string>
+                                    </property>
                                 </widget>
                                 <widget class="QLabel" row="4" column="0">
                                     <property name="name">
                                         <cstring>noWordsTL</cstring>
                                     </property>
                                     <property name="text">
-                                        <string>None of these words</string>
+                                        <string>None of these</string>
                                     </property>
                                 </widget>
                                 <widget class="QLineEdit" row="4" column="1">
                                     <property name="name">
                                         <cstring>noWordsLE</cstring>
                                     </property>
+                                    <property name="toolTip" stdset="0">
+                                        <string>Enter words, and/or quoted phrases.</string>
+                                    </property>
                                 </widget>
                                 <widget class="QLabel" row="5" column="0">
                                     <property name="name">
@@ -137,6 +158,9 @@
                                     <property name="name">
                                         <cstring>fileNameLE</cstring>
                                     </property>
+                                    <property name="toolTip" stdset="0">
+                                        <string>Enter file name. * and ? are wildcards.</string>
+                                    </property>
                                 </widget>
                             </grid>
                         </widget>