Skip to content

Commit ffc8296

Browse files
Merge branch 'master' into update-docments.md
2 parents fe86e84 + 4290302 commit ffc8296

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+32159
-19723
lines changed

.code-samples.meilisearch.yaml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@ search_parameter_guide_highlight_tag_1: |-
387387
curl \
388388
-X POST 'http://localhost:7700/indexes/movies/search' \
389389
-H 'Content-Type: application/json' \
390-
--data-binary '{
391-
"q": "winter feast",
390+
--data-binary '{
391+
"q": "winter feast",
392392
"attributesToHighlight": ["overview"],
393393
"highlightPreTag": "<span class=\"highlight\">",
394394
"highlightPostTag": "</span>"
@@ -770,7 +770,7 @@ primary_field_guide_add_document_primary_key: |-
770770
"genres": ["comedy","humor"],
771771
"price": 5.00
772772
}]'
773-
primary_field_guide_update_document_primary_key: |
773+
primary_field_guide_update_document_primary_key: |-
774774
curl \
775775
-X PUT 'http://localhost:7700/indexes/books' \
776776
-H 'Content-Type: application/json' \
@@ -806,7 +806,7 @@ typo_tolerance_guide_1: |-
806806
-H 'Content-Type: application/json' \
807807
--data-binary '{
808808
"enabled": false
809-
}'
809+
}'
810810
typo_tolerance_guide_2: |-
811811
curl \
812812
-X POST 'http://localhost:7700/indexes/movies/settings/typo-tolerance' \
@@ -847,10 +847,14 @@ settings_guide_typo_tolerance_1: |-
847847
"title"
848848
]
849849
}'
850-
updating_guide_check_version: |-
850+
updating_guide_check_version_new_authorization_header: |-
851851
curl \
852-
-X GET 'http://127.0.0.1:7700/version' \
853-
-H 'Authorization: Bearer apiKey'
852+
-X GET 'http://127.0.0.1:7700/version' \
853+
-H 'Authorization: Bearer apiKey'
854+
updating_guide_check_version_old_authorization_header: |-
855+
curl \
856+
-X GET 'http://127.0.0.1:7700/version' \
857+
-H 'X-Meili-API-Key: apiKey'
854858
updating_guide_get_displayed_attributes_new: |-
855859
# whenever you see {index_uid}, replace it with your index's unique id
856860
curl \
@@ -860,15 +864,15 @@ updating_guide_get_displayed_attributes_old: |-
860864
# whenever you see {index_uid}, replace it with your index's unique id
861865
curl \
862866
-X GET 'http://127.0.0.1:7700/indexes/{index_uid}/settings/displayed-attributes' \
863-
-H 'X-Meili-API-Key: apiKey'
867+
-H 'X-Meili-API-Key: apiKey'
864868
updating_guide_reset_displayed_attributes_new: |-
865869
curl \
866870
-X DELETE 'http://127.0.0.1:7700/indexes/{index_uid}/settings/displayed-attributes' \
867871
-H 'Authorization: Bearer apiKey'
868872
updating_guide_reset_displayed_attributes_old: |-
869873
curl \
870874
-X DELETE 'http://127.0.0.1:7700/indexes/{index_uid}/settings/displayed-attributes' \
871-
-H 'X-Meili-API-Key: apiKey'
875+
-H 'X-Meili-API-Key: apiKey'
872876
updating_guide_create_dump: |-
873877
curl \
874878
-X POST 'http://127.0.0.1:7700/dumps' \
@@ -878,26 +882,25 @@ updating_guide_get_dump_status: |-
878882
curl \
879883
-X GET 'http://127.0.0.1:7700/dumps/{dump_uid}/status' \
880884
-H 'Authorization: Bearer apiKey'
881-
updating_guide_get_settings: |-
885+
updating_guide_get_settings_old: |-
882886
# the -o option saves the output as a local file
883887
curl \
884888
-X GET 'http://127.0.0.1:7700/indexes/{index_uid}/settings' -o mysettings.json \
885889
-H 'X-Meili-API-Key: apiKey'
886-
updating_guide_retrieve_documents: |-
890+
updating_guide_retrieve_documents_old: |-
887891
# the -o option saves the output as a local file
888892
curl \
889-
-X GET 'http://127.0.0.1:7700/indexes/{index_uid}/documents?limit=n' \ -o mydocuments.json \
893+
-X GET 'http://127.0.0.1:7700/indexes/{index_uid}/documents?limit=n' \ -o mydocuments.json \
890894
-H 'X-Meili-API-Key: apiKey'
891-
updating_guide_update_settings: |-
895+
updating_guide_update_settings_old: |-
892896
# update your settings
893897
curl \
894898
-X POST 'http://127.0.0.1:7700/indexes/{index_uid}/settings' \
895899
-H 'Content-Type: application/json' -d @mysettings.json \
896900
-H 'X-Meili-API-Key: apiKey'
897-
updating_guide_add_documents: |-
901+
updating_guide_add_documents_old: |-
898902
# then, add your documents
899903
curl \
900904
-X POST 'http://127.0.0.1:7700/indexes/{index_uid}/documents' \
901905
-H 'Content-Type: application/json' -d @mydocuments.json \
902906
-H 'X-Meili-API-Key: apiKey'
903-

.vuepress/config-path-checker/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ This local plugin checks inside the routing of `config.js` every chosen predicat
44

55
These are the current predicates:
66

7-
### Parent's paths must contains a trailing html extension
7+
### Parent's paths must contains a trailing HTML extension
88

9-
This predicate only applies to elements that do have childs.
9+
This predicate only applies to elements that have children.
1010

1111
For example:
1212

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

.vuepress/public/movies.json

Lines changed: 31968 additions & 19547 deletions
Large diffs are not rendered by default.

.vuepress/public/sample-template.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,15 @@ typo_tolerance_guide_2: |-
133133
typo_tolerance_guide_3: |-
134134
typo_tolerance_guide_4: |-
135135
settings_guide_typo_tolerance_1: |-
136-
updating_guide_check_version: |-
136+
updating_guide_check_version_new_authorization_header: |-
137+
updating_guide_check_version_old_authorization_header: |-
137138
updating_guide_get_displayed_attributes_new: |-
138139
updating_guide_get_displayed_attributes_old: |-
139140
updating_guide_reset_displayed_attributes_old: |-
140141
updating_guide_reset_displayed_attributes_new: |-
141142
updating_guide_create_dump: |-
142143
updating_guide_get_dump_status: |-
143-
updating_guide_get_settings: |-
144-
updating_guide_retrieve_documents: |-
145-
updating_guide_update_settings: |-
146-
updating_guide_add_documents: |-
144+
updating_guide_get_settings_old: |-
145+
updating_guide_retrieve_documents_old: |-
146+
updating_guide_update_settings_old: |-
147+
updating_guide_add_documents_old: |-

.vuepress/public/search_preview.png

-249 KB
Binary file not shown.
1.52 MB
Loading
Loading
Loading
-269 KB
Binary file not shown.

learn/advanced/filtering_and_faceted_search.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Suppose you have a collection of movies containing the following fields:
2727
```json
2828
[
2929
{
30-
"id": "458723",
30+
"id": 458723,
3131
"title": "Us",
3232
"director": "Jordan Peele",
3333
"genres": [
@@ -167,7 +167,7 @@ Suppose that you have a dataset containing several movies in the following forma
167167
[
168168
169169
{
170-
"id": "458723",
170+
"id": 458723,
171171
"title": "Us",
172172
"director": "Jordan Peele",
173173
"poster": "https://image.tmdb.org/t/p/w1280/ux2dU1jQ2ACIMShzB3yP93Udpzc.jpg",

learn/advanced/snapshots_vs_dumps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Data backup: snapshots vs. dumps
1+
# Data backup: Snapshots vs dumps
22

33
Meilisearch has two ways to backup its data: `snapshots` and `dumps`.
44

learn/advanced/updating.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ Before we begin, you need to **verify the version of Meilisearch that's compatib
1818

1919
If Meilisearch launches successfully, use the [get version endpoint](/reference/api/version.md), note your `pkgVersion`, and [proceed to the next step](#proceed-according-to-your-database-version).
2020

21-
<CodeSamples id="updating_guide_check_version" />
21+
<CodeSamples id="updating_guide_check_version_new_authorization_header" />
22+
23+
::: note
24+
If you're using v0.24 or below, use the `X-MEILI-API-KEY: apiKey` authorization header:
25+
<CodeSamples id="updating_guide_check_version_old_authorization_header" />
26+
:::
2227

2328
The response should look something like this:
2429

@@ -269,7 +274,7 @@ If you don’t need to preserve index settings, skip directly to [step two](#ste
269274

270275
First, use the [get settings endpoint](/reference/api/settings.md#get-settings) to retrieve the [settings](/learn/configuration/settings.md) of any indexes you want to preserve, and save them to a file using the method you prefer.
271276

272-
<CodeSamples id="updating_guide_get_settings" />
277+
<CodeSamples id="updating_guide_get_settings_old" />
273278

274279
Repeat this process for all indexes you wish to migrate.
275280

@@ -297,7 +302,7 @@ Now that all fields are displayed, proceed to the next step.
297302

298303
Use the [get documents endpoint](/reference/api/documents.md#get-documents) to retrieve your documents and save them using the method you prefer. Make sure to set the `limit` on documents returned so that, if you have some number of documents `n`, `limit ≥ n`. Otherwise, you risk data loss.
299304

300-
<CodeSamples id="updating_guide_retrieve_documents" />
305+
<CodeSamples id="updating_guide_retrieve_documents_old" />
301306

302307
### Step 4: Delete the database folder
303308

@@ -309,9 +314,9 @@ Finally, [install the latest version of Meilisearch](/learn/getting_started/quic
309314

310315
If you chose to save your settings, make sure to follow this order:
311316

312-
<CodeSamples id="updating_guide_update_settings" />
317+
<CodeSamples id="updating_guide_update_settings_old" />
313318

314-
<CodeSamples id="updating_guide_add_documents" />
319+
<CodeSamples id="updating_guide_add_documents_old" />
315320

316321
Since updating the settings requires re-indexing all documents, this order saves time and memory.
317322

learn/configuration/settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This page describes the **index-level settings** available in Meilisearch and ho
77
| **[displayedAttributes](/learn/configuration/settings.md#displayed-attributes)** | Fields displayed in the returned documents | All attributes found in the documents |
88
| **[distinctAttribute](/learn/configuration/settings.md#distinct-attribute)** | Search returns documents with distinct (different) values of the given field | `null` |
99
| **[filterableAttributes](/learn/configuration/settings.md#filterable-attributes)** | List of attributes that can be used for filtering | `null` |
10-
| **[rankingRules](/learn/configuration/settings.md#ranking-rules)** | List of ranking rules sorted by order of importance | [A list of ordered built-in ranking rules](/learn/core_concepts/relevancy.md#default-order) |
10+
| **[rankingRules](/learn/configuration/settings.md#ranking-rules)** | List of ranking rules sorted by order of importance | [A list of ordered built-in ranking rules](/learn/core_concepts/relevancy.md#built-in-rules) |
1111
| **[searchableAttributes](/learn/configuration/settings.md#searchable-attributes)** | Fields in which to search for matching query words sorted by order of importance | All attributes found in the documents | |
1212
| **[sortableAttributes](/learn/configuration/settings.md#sortable-attributes)** | List of attributes to use when sorting search results | `[]` |
1313
| **[stopWords](/learn/configuration/settings.md#stop-words)** | List of words ignored by Meilisearch when present in search queries | `[]` |

learn/configuration/synonyms.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ All synonyms are **lowercased** and **de-unicoded** during the indexing process.
1111

1212
#### Example
1313

14-
Consider a situation where "Résumé" and "CV" are set as synonyms.
14+
Consider a situation where `Résumé` and `CV` are set as synonyms.
1515

1616
```json
1717
{
@@ -24,7 +24,7 @@ Consider a situation where "Résumé" and "CV" are set as synonyms.
2424
}
2525
```
2626

27-
A search for "cv" would return any documents containing "cv" or "CV", in addition to any that contain "Résumé", "resumé", "resume", etc. unaffected by case or accent marks.
27+
A search for `cv` would return any documents containing `cv` or `CV`, in addition to any that contain `Résumé`, `resumé`, `resume`, etc., unaffected by case or accent marks.
2828

2929
## One-way association
3030

@@ -97,12 +97,12 @@ When a multi-word phrase is considered the synonym of another word or phrase, th
9797

9898
::: tip
9999
Multi-word synonyms are limited to a maximum of **three words**.
100-
For example, although you could make "League of Legends" and "LOL" into synonyms, you could not do the same for "The Lord of the Rings" and "LOTR".
100+
For example, although you could make `League of Legends` and `LOL` into synonyms, you could not do the same for `The Lord of the Rings` and `LOTR`.
101101
:::
102102

103103
#### Example
104104

105-
Suppose you set "San Francisco" and "SF" as synonyms with a [mutual association](#mutual-association)
105+
Suppose you set `San Francisco` and `SF` as synonyms with a [mutual association](#mutual-association)
106106

107107
```json
108108
{
@@ -115,4 +115,4 @@ Suppose you set "San Francisco" and "SF" as synonyms with a [mutual association]
115115
}
116116
```
117117

118-
If you input "SF" as a search query, then results containing "San Francisco" will also be returned. However, **they will be considered less [relevant](/learn/core_concepts/relevancy.md) than those containing "SF"**. The reverse is also true.
118+
If you input `SF` as a search query, then results containing `San Francisco` will also be returned. However, **they will be considered less [relevant](/learn/core_concepts/relevancy.md) than those containing `SF`**. The reverse is also true.

learn/configuration/typo_tolerance.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ We recommend keeping the value of `oneTypo` between `2` and `8` and the value of
3434
Meilisearch considers a typo on a query's first character as two typos.
3535

3636
**Concatenation**
37-
When considering possible candidates for typo tolerance, Meilisearch will concatenate multiple search terms separated by a [space separator](/learn/advanced/datatypes.md#string). This is treated as one typo. For example, a search for "any way" would match documents containing "anyway".
37+
When considering possible candidates for typo tolerance, Meilisearch will concatenate multiple search terms separated by a [space separator](/learn/advanced/datatypes.md#string). This is treated as one typo. For example, a search for `any way` would match documents containing `anyway`.
3838

3939
For more about typo calculations, [see below](#understanding-typo-calculations).
4040
:::
@@ -77,19 +77,19 @@ Meilisearch uses a prefix [Levenshtein algorithm](https://en.wikipedia.org/wiki/
7777

7878
The [number of typos referenced above](#minwordsizefortypos) is roughly equivalent to Levenshtein distance. The Levenshtein distance between two words _M_ and _P_ can be thought of as "the minimum cost of transforming _M_ into _P_" by performing the following elementary operations on _M_:
7979

80-
- substitution of a character (e.g., **k**itten**s**itten)
81-
- insertion of a character (e.g., siting → sit**t**ing)
82-
- deletion of a character (e.g., satu**r**day → satuday)
80+
- substitution of a character (e.g., `kitten``sitten`)
81+
- insertion of a character (e.g., `siting``sitting`)
82+
- deletion of a character (e.g., `saturday``satuday`)
8383

8484
By default, Meilisearch uses the following rules for matching documents. Note that these rules are **by word** and not for the whole query string.
8585

8686
- If the query word is between `1` and `4` characters, **no typo** is allowed. Only documents that contain words that **start with** or are of the **same length** with this query word are considered valid
8787
- If the query word is between `5` and `8` characters, **one typo** is allowed. Documents that contain words that match with **one typo** are retained for the next steps.
8888
- If the query word contains more than `8` characters, we accept a maximum of **two typos**
8989

90-
This means that "saturday" which is `7` characters long, uses the second rule and matches every document containing **one typo**. For example:
90+
This means that `saturday` which is `7` characters long, uses the second rule and matches every document containing **one typo**. For example:
9191

92-
- "saturday" is accepted because it is the same word
93-
- "satuday" is accepted because it contains **one typo**
94-
- "sutuday" is not accepted because it contains **two typos**
95-
- "caturday" is not accepted because it contains **two typos** (as explained [above](#minwordsizefortypos), a typo on the first letter of a word is treated as two typos)
92+
- `saturday` is accepted because it is the same word
93+
- `satuday` is accepted because it contains **one typo**
94+
- `sutuday` is not accepted because it contains **two typos**
95+
- `caturday` is not accepted because it contains **two typos** (as explained [above](#minwordsizefortypos), a typo on the first letter of a word is treated as two typos)

learn/cookbooks/aws.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ In the top-right corner, click on the **Launch instances** button to start the p
2323

2424
You will now select which AMI or system Image to use to run your instance. Type **"meilisearch"** in the search bar and select the **Community AMIs** tab on the left sidebar.
2525

26-
![Page titled: 'Step 1: Choose an Amazon Machine Image (AMI)'. There is only one AMI available, MeiliSearch-v0.19.0-Debian-10.3](/aws/02.select-ami.png)
26+
![Page titled: 'Step 1: Choose an Amazon Machine Image (AMI)'](/aws/02.select-ami.png)
2727

2828
Click on **Select** (right side of the screen) to confirm your choice.
2929

learn/cookbooks/azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Meilisearch has snapshot and dump features that can help improve your backup cap
6565

6666
### Always-on
6767

68-
To enable free tier, the _Always-on_ option is disabled by default. That means that after some time without any traffic, your instance will be deallocated. When the next client hits your instance, it'll be started again automatically. However, you will have a response time in the dozen-seconds range.
68+
To enable free tier, the _Always-on_ option is disabled by default. That means that after some time without any traffic, your instance will be deactivated. When the next client hits your instance, it'll be started again automatically. However, you will have a response time in the dozen-seconds range.
6969

7070
You can avoid this _cold start_ by enabling the _Always-on_ feature, either in the Azure portal or in the Infrastructure as Code.
7171

learn/cookbooks/koyeb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ python -c 'import os,base64; print(base64.urlsafe_b64encode(os.urandom(32)).deco
2525
```
2626

2727
::: warning
28-
Setting up a master key is optional but strongly recommended when running in production. Unsetting the master key will make your Meilisearch instance unprotected and publicly accessible.
28+
Using a master key is optional but strongly recommended when running in production. If you launch without a master key, your Meilisearch instance will be unprotected and publicly accessible.
2929
:::
3030

3131
### Test Meilisearch

learn/core_concepts/documents.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ As an example, let's say you are creating an index that contains information abo
7070

7171
```json
7272
{
73-
"id": "1564saqw12ss",
73+
"id": 1564,
7474
"title": "Kung Fu Panda",
7575
"genres": "Children's Animation",
7676
"release-year": 2008,
@@ -98,7 +98,7 @@ Compared to JSON, NDJSON has better writing performance and is less CPU and memo
9898
The above JSON document would look like this in NDJSON:
9999

100100
```json
101-
{ "id": "1564saqw12ss", "title": "Kung Fu Panda", "genres": "Children's Animation", "release-year": 2008, "cast": [{ "Jack Black": "Po" }, { "Jackie Chan": "Monkey" }] }
101+
{ "id": 1564, "title": "Kung Fu Panda", "genres": "Children's Animation", "release-year": 2008, "cast": [{ "Jack Black": "Po" }, { "Jackie Chan": "Monkey" }] }
102102
```
103103

104104
#### CSV
@@ -112,8 +112,8 @@ Compared to JSON, CSV has better writing performance and is less CPU and memory
112112
The above JSON document would look like this in CSV:
113113

114114
```csv
115-
"id:string","title:string","genres:string","release-year:number"
116-
"1564saqw12ss","Kung Fu Panda","Children's Animation","2008"
115+
"id:number","title:string","genres:string","release-year:number"
116+
"1564","Kung Fu Panda","Children's Animation","2008"
117117
```
118118

119119
Since CSV does not support arrays or nested objects, `cast` cannot be converted to CSV.

0 commit comments

Comments
 (0)