diff --git a/src/doc/user/usermanual.html b/src/doc/user/usermanual.html index 431dd18a..5c8534c9 100644 --- a/src/doc/user/usermanual.html +++ b/src/doc/user/usermanual.html @@ -430,7 +430,7 @@ alink="#0000FF">

List of Tables

-
3.1. Keyboard shortcuts
+
3.1. Keyboard shortcuts
@@ -3804,25 +3804,44 @@ fs.inotify.max_user_watches=32768 accept a mix of single words and phrases enclosed in double quotes. Stemming and wildcard expansion will be performed as for simple search.

-

Phrases and Proximity searches. These - two clauses work in similar ways, with the difference - that proximity searches do not impose an order on the - words. In both cases, an adjustable number (slack) of - non-matched words may be accepted between the searched - ones (use the counter on the left to adjust this - count). For phrases, the default count is zero (exact - match). For proximity it is ten (meaning that two - search terms, would be matched if found within a window - of twelve words). Examples: a phrase search for - quick fox with a slack of - 0 will match quick fox but - not quick brown fox. With - a slack of 1 it will match the latter, but not - fox quick. A proximity - search for quick fox with - the default slack will match the latter, and also - a fox is a cunning and quick - animal.

+
+
+
+
+
Phrase + and Proximity searches
+
+
+
+

These two clauses look for a group of terms in + specified relative positions. They differ in the + sense that the order of input terms is significant + for phrase searches, but + not for proximity + searches. The latter do not impose an order on the + words. In both cases, an adjustable number (slack) of + non-matched words may be accepted between the + searched ones. For phrase searches, the default count + is zero (exact match). For proximity searches it is ten + (meaning that two search terms, would be matched if + found within a window of twelve words).

+

Examples: a phrase search for quick fox with a slack of 0 will + match quick fox but not + quick brown fox. With a + slack of 1 it will match the latter, but not + fox quick. A proximity + search for quick fox + with the default slack will match the latter, and + also a fox is a cunning and + quick animal.

+

The slack can be adjusted with the counter to the + left of the input area

+
@@ -4188,7 +4207,7 @@ fs.inotify.max_user_watches=32768 Shortcut column, and type the desired sequence.

- +

Table 3.1. Keyboard shortcuts

@@ -5449,13 +5468,16 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r

An element preceded by a - specifies a term that should not appear.

-

As usual, words inside quotes define a phrase (the - order of words is significant), so that By default, words inside double-quotes define a + phrase search (the order of + words is significant), so that title:"prejudice pride" is not the same as title:prejudice title:pride, and is unlikely to find a - result.

+ result. This can be changed by using modifiers.

Words inside phrases and capitalized words are not stem-expanded. Wildcards may be used anywhere inside a term. Specifying a wildcard on the left of a term can @@ -5860,19 +5882,30 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r "application">Recoll 1.22 and later).

  • -

    o can be used to - specify a "slack" for phrase and proximity - searches: the number of additional terms that may - be found between the specified ones. If - o is followed by an - integer number, this is the slack, else the default - is 10.

    +

    p can be used to + turn an ordered phrase + search into an unordered proximity one. Example: + "order any in"p. You + can find a little more detail about phrase and proximity searches here.

  • -

    p can be used to - turn the default phrase search into a proximity one - (unordered). Example: "order - any in"p

    +

    o can be used to + specify a "slack" for both phrase and proximity searches: the number of + additional terms that may be found between the + specified ones. If o + is followed by an integer number, this is the + slack, else the default is 10. The default slack + (with no o) is 0 for + phrase searches and 10 + for proximity + searches.

  • C will turn on case diff --git a/src/doc/user/usermanual.xml b/src/doc/user/usermanual.xml index aa2cbd8b..a7b28bee 100644 --- a/src/doc/user/usermanual.xml +++ b/src/doc/user/usermanual.xml @@ -2692,24 +2692,29 @@ fs.inotify.max_user_watches=32768 Stemming and wildcard expansion will be performed as for simple search. - Phrases and Proximity searches - These two clauses work in similar ways, with the difference - that proximity searches do not impose an order on the words. In - both cases, an adjustable number (slack) of non-matched words may - be accepted between the searched ones (use the counter on the - left to adjust this count). For phrases, the default count is - zero (exact match). For proximity it is ten (meaning that two - search terms, would be matched if found within a window of twelve - words). Examples: a phrase search for - quick fox with a slack of 0 will match - quick fox but not - quick brown fox. With - a slack of 1 it will match the latter, but not - fox quick. A proximity search for - quick fox with the default slack will - match the latter, and also - a fox is a cunning and quick animal. - + + Phrase and Proximity searches + These two clauses look for a group of terms in + specified relative positions. They differ in the sense that the order of input terms + is significant for phrase searches, but not + for proximity searches. The latter do not impose an order on the + words. In both cases, an adjustable number (slack) of non-matched words may be + accepted between the searched ones. For phrase searches, the + default count is zero (exact match). For proximity searches it is + ten (meaning that two search terms, would be matched if found within a window of + twelve words). + Examples: a phrase search for + quick fox with a slack of 0 will match + quick fox but not + quick brown fox. With + a slack of 1 it will match the latter, but not + fox quick. A proximity search for + quick fox with the default slack will + match the latter, and also + a fox is a cunning and quick animal. + The slack can be adjusted with the counter to the left of the + input area + @@ -4030,10 +4035,12 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r An element preceded by a - specifies a term that should not appear. - As usual, words inside quotes define a phrase (the order of words is significant), so - that title:"prejudice pride" is not the same - as title:prejudice title:pride, and is unlikely to find a - result. + By default, words inside double-quotes define a phrase search (the + order of words is significant), so + that title:"prejudice pride" is not the same + as title:prejudice title:pride, and is unlikely to find a + result. This can be changed by + using modifiers. Words inside phrases and capitalized words are not stem-expanded. Wildcards may be used anywhere inside a term. Specifying a wildcard on the left of a term can produce a very slow @@ -4323,16 +4330,21 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r &RCL; 1.22 and later). - o can be used to specify a - "slack" for phrase and proximity searches: the number of - additional terms that may be found between the specified - ones. If o is followed by an integer number, - this is the slack, else the default is 10. + p can be used to turn an ordered + phrase search into an unordered proximity + one. Example: "order any in"p. You can find a little more detail + about phrase and proximity searches + here. - p can be used to turn the - default phrase search into a proximity one - (unordered). Example: "order any in"p + o can be used to specify a + "slack" for both phrase and proximity searches: + the number of + additional terms that may be found between the specified + ones. If o is followed by an integer number, + this is the slack, else the default is 10. The default slack (with + no o) is 0 for phrase searches and 10 for + proximity searches. C will turn on case