Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: Id2b91b27583724cfd289f264724aa780edcccbde

10 files changed, 6 insertions, 15 deletions

diff --git a/src/assistant/assistant/doc/images/assistant-assistant.png b/src/assistant/assistant/doc/images/assistant-assistant.png
index d76ec0420..368b5c932 100644
--- a/src/assistant/assistant/doc/images/assistant-assistant.png
+++ b/src/assistant/assistant/doc/images/assistant-assistant.png
diff --git a/src/assistant/assistant/doc/images/assistant-bookmarks.png b/src/assistant/assistant/doc/images/assistant-bookmarks.png
index 810d23960..9acdb8300 100644
--- a/src/assistant/assistant/doc/images/assistant-bookmarks.png
+++ b/src/assistant/assistant/doc/images/assistant-bookmarks.png
diff --git a/src/assistant/assistant/doc/images/assistant-dockwidgets.png b/src/assistant/assistant/doc/images/assistant-dockwidgets.png
index 7a9c386a6..c657426e9 100644
--- a/src/assistant/assistant/doc/images/assistant-dockwidgets.png
+++ b/src/assistant/assistant/doc/images/assistant-dockwidgets.png
diff --git a/src/assistant/assistant/doc/images/assistant-index.png b/src/assistant/assistant/doc/images/assistant-index.png
index 548c349e5..685396c97 100644
--- a/src/assistant/assistant/doc/images/assistant-index.png
+++ b/src/assistant/assistant/doc/images/assistant-index.png
diff --git a/src/assistant/assistant/doc/images/assistant-preferences-documentation.png b/src/assistant/assistant/doc/images/assistant-preferences-documentation.png
index e640176ac..92e8e0568 100644
--- a/src/assistant/assistant/doc/images/assistant-preferences-documentation.png
+++ b/src/assistant/assistant/doc/images/assistant-preferences-documentation.png
diff --git a/src/assistant/assistant/doc/images/assistant-preferences-filters.png b/src/assistant/assistant/doc/images/assistant-preferences-filters.png
index 3af283085..cdeda5c3d 100644
--- a/src/assistant/assistant/doc/images/assistant-preferences-filters.png
+++ b/src/assistant/assistant/doc/images/assistant-preferences-filters.png
diff --git a/src/assistant/assistant/doc/images/assistant-preferences-fonts.png b/src/assistant/assistant/doc/images/assistant-preferences-fonts.png
index 4d9375917..a3879ec89 100644
--- a/src/assistant/assistant/doc/images/assistant-preferences-fonts.png
+++ b/src/assistant/assistant/doc/images/assistant-preferences-fonts.png
diff --git a/src/assistant/assistant/doc/images/assistant-preferences-options.png b/src/assistant/assistant/doc/images/assistant-preferences-options.png
index 3a9efad6a..38233b7cf 100644
--- a/src/assistant/assistant/doc/images/assistant-preferences-options.png
+++ b/src/assistant/assistant/doc/images/assistant-preferences-options.png
diff --git a/src/assistant/assistant/doc/images/assistant-search.png b/src/assistant/assistant/doc/images/assistant-search.png
index 3ab3caf9d..847af8ba2 100644
--- a/src/assistant/assistant/doc/images/assistant-search.png
+++ b/src/assistant/assistant/doc/images/assistant-search.png
diff --git a/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc b/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc
index 28590fa25..411bf19e1 100644
--- a/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc
+++ b/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc
@@ -169,8 +169,12 @@
     \QA provides a powerful full text search engine. You can search for certain
     words or text in the \gui Search window. Enter the text you want to look for
     and press \key{Enter} or click \gui{Search}. The search is not case sensitive.
-    For example, \b Foo, \b fOo and \b FOO are all treated as the same. The
-    following are examples of common search patterns:
+    For example, \b Foo, \b fOo and \b FOO are all treated as the same.
+
+    You can create complex queries using the
+    \l{https://sqlite.org/fts5.html#full_text_query_syntax}{FTS query syntax}.
+
+    The following are examples of common search patterns:
 
     \list
     \li \c deep -- lists all the documents that contain the word \b deep
@@ -182,19 +186,6 @@
      \b {deep copy}
     \endlist
 
-    Use the \gui{Advanced search} for more flexibility.
-    You can specify some words so that hits containing these are excluded from the
-    result, or you can search for an exact phrase. Searching for similar words will
-    give results like these:
-
-    \list
-    \li \c{QStin} -- lists all the documents with titles that are similar, such as \c{QString}
-    \li \c{QSting} -- lists all the documents with titles that are similar, such as \c{QString}
-    \li \c{QStrin} -- lists all the documents with titles that are similar, such as \c{QString}
-    \endlist
-
-    Options can be combined to improve the search results.
-
     The list of documents found is ordered according to the number of
     occurrences of the search text which they contain, with those containing
     the highest number of occurrences appearing first. Simply click any