Skip to content

Commit b8f4ebb

Browse files
Merge pull request #101251 from HeidiSteen/heidist-toc
Azure Cog Search: TOC mockup
2 parents ced298d + f9459ab commit b8f4ebb

File tree

4 files changed

+131
-110
lines changed

4 files changed

+131
-110
lines changed

articles/search/TOC.yml

Lines changed: 102 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@
6464
- name: Samples
6565
items:
6666
- name: C# samples
67-
href: https://docs.microsoft.com/samples/browse/?products=azure-search&languages=csharp
67+
href: https://docs.microsoft.com/samples/browse/?products=azure-cognitive-search&languages=csharp
6868
- name: Java samples
69-
href: https://docs.microsoft.com/samples/browse/?products=azure-search&languages=java
69+
href: https://docs.microsoft.com/samples/browse/?products=azure-cognitive-search&languages=java
7070
- name: JavaScript samples
71-
href: https://docs.microsoft.com/samples/browse/?products=azure-search&languages=javascript
71+
href: https://docs.microsoft.com/samples/browse/?products=azure-cognitive-search&languages=javascript
7272
- name: Python samples
73-
href: https://docs.microsoft.com/samples/browse/?products=azure-search&languages=python
73+
href: https://docs.microsoft.com/samples/browse/?products=azure-cognitive-search&languages=python
7474
- name: REST samples
75-
href: https://docs.microsoft.com/samples/browse/?products=azure-search&languages=rest
75+
href: https://docs.microsoft.com/samples/browse/?products=azure-cognitive-search&languages=rest
7676
- name: Training
7777
items:
7878
- name: Introduction (Microsoft Learn)
@@ -131,6 +131,8 @@
131131
items:
132132
- name: API versions
133133
href: search-api-versions.md
134+
- name: Preview feature list
135+
href: search-api-preview.md
134136
- name: Develop in .NET
135137
href: search-howto-dotnet-sdk.md
136138
- name: Upgrade the SDK
@@ -149,7 +151,7 @@
149151
href: search-dotnet-mgmt-sdk-migration.md
150152
- name: Upgrade the REST API
151153
href: search-api-migration.md
152-
- name: Creating indexes
154+
- name: Create an index
153155
items:
154156
- name: Create a basic index
155157
href: search-what-is-an-index.md
@@ -181,7 +183,7 @@
181183
href: search-howto-complex-data-types.md
182184
- name: Model relational data
183185
href: index-sql-relational-data.md
184-
- name: Import (indexing)
186+
- name: Indexing (import)
185187
items:
186188
- name: Data import overview
187189
href: search-what-is-data-import.md
@@ -193,43 +195,45 @@
193195
href: search-howto-large-index.md
194196
- name: Handle concurrent updates
195197
href: search-howto-concurrency.md
196-
- name: Indexing Azure Blob data
197-
items:
198-
- name: Use AI with blob data
199-
href: search-blob-ai-integration.md
200-
- name: Add full text search
201-
href: search-blob-storage-integration.md
202-
- name: Set up a blob indexer
203-
href: search-howto-indexing-azure-blob-storage.md
204-
- name: Set up an Azure Data Lake Storage Gen2 indexer
205-
href: search-howto-index-azure-data-lake-storage.md
206-
- name: Index one-to-many blobs
207-
href: search-howto-index-one-to-many-blobs.md
208-
- name: Index CSV blobs
209-
href: search-howto-index-csv-blobs.md
210-
- name: Index JSON blobs
211-
href: search-howto-index-json-blobs.md
212-
- name: Indexing with "indexers"
198+
- name: Use an indexer
213199
items:
214-
- name: Indexers overview
200+
- name: Configure indexers
215201
href: search-indexer-overview.md
216-
- name: Azure Table Storage indexer
217-
href: search-howto-indexing-azure-tables.md
218-
- name: Azure SQL DB indexer
219-
href: search-howto-connecting-azure-sql-database-to-azure-search-using-indexers.md
220-
- name: Azure Cosmos DB indexer
221-
href: search-howto-index-cosmosdb.md
222-
- name: Schedule indexers
223-
href: search-howto-schedule-indexers.md
224202
- name: Map fields
225203
href: search-indexer-field-mappings.md
226-
- name: Connect to SQL Managed Instance
227-
href: search-howto-connecting-azure-sql-mi-to-azure-search-using-indexers.md
228-
- name: Connect to SQL Server VMs
229-
href: search-howto-connecting-azure-sql-iaas-to-azure-search-using-indexers.md
230204
- name: Monitor indexers
231205
href: search-howto-monitor-indexers.md
232-
- name: Enrich with AI
206+
- name: Schedule indexers
207+
href: search-howto-schedule-indexers.md
208+
- name: Data sources
209+
items:
210+
- name: Azure Blobs
211+
items:
212+
- name: Search over blobs
213+
href: search-blob-storage-integration.md
214+
- name: Understand blobs with AI
215+
href: search-blob-ai-integration.md
216+
- name: Configure a blob indexer
217+
href: search-howto-indexing-azure-blob-storage.md
218+
- name: Index one-to-many blobs
219+
href: search-howto-index-one-to-many-blobs.md
220+
- name: Index CSV blobs
221+
href: search-howto-index-csv-blobs.md
222+
- name: Index JSON blobs
223+
href: search-howto-index-json-blobs.md
224+
- name: Azure Cosmos DB
225+
href: search-howto-index-cosmosdb.md
226+
- name: Azure Data Lake Storage Gen2
227+
href: search-howto-index-azure-data-lake-storage.md
228+
- name: Azure SQL Database
229+
href: search-howto-connecting-azure-sql-database-to-azure-search-using-indexers.md
230+
- name: Azure Table Storage
231+
href: search-howto-indexing-azure-tables.md
232+
- name: SQL Managed Instances
233+
href: search-howto-connecting-azure-sql-mi-to-azure-search-using-indexers.md
234+
- name: SQL Server VMs
235+
href: search-howto-connecting-azure-sql-iaas-to-azure-search-using-indexers.md
236+
- name: AI enrichment
233237
items:
234238
- name: Attach a Cognitive Services resource
235239
href: cognitive-search-attach-cognitive-services.md
@@ -326,27 +330,31 @@
326330
- name: Reference
327331
items:
328332
- name: Azure CLI
329-
href: https://docs.microsoft.com/cli/azure/search?view=azure-cli-latest
333+
href: /cli/azure/search?view=azure-cli-latest
330334
- name: Azure PowerShell
331335
href: /powershell/module/az.search
336+
- name: Resource Manager template
337+
href: /azure/templates/microsoft.search/searchservices
332338
- name: .NET
333-
href: /dotnet/api/?term=microsoft.azure.search
334-
- name: .NET (Management)
335-
href: /dotnet/api/?term=microsoft.azure.management.search
336-
- name: Python (Management)
337-
href: /python/api/?view=azure-python&term=search
339+
items:
340+
- name: microsoft.azure.search
341+
href: /dotnet/api/overview/azure/search?view=azure-dotnet
342+
- name: microsoft.azure.management.search
343+
href: /dotnet/api/overview/azure/search/management?view=azure-dotnet
338344
- name: REST
339-
href: /rest/api/searchservice
340-
- name: REST (Management)
341-
href: /rest/api/searchmanagement
342-
- name: REST (Preview)
343345
items:
344-
- name: API version 2019-05-06-Preview
345-
href: search-api-preview.md
346-
- name: Reset Skills API
346+
- name: Search 2019-05-06
347+
href: /rest/api/searchservice
348+
- name: Reset Skills (api-version=2019-05-06-Preview)
347349
href: preview-api-resetskills.md
348-
- name: Resource Manager template
349-
href: /azure/templates/microsoft.search/searchservices
350+
- name: Management 2015-08-15
351+
href: /rest/api/searchmanagement
352+
- name: Management 2019-10-01-Preview
353+
href: /rest/api/searchmanagement/index-2019-10-01-preview
354+
- name: Python
355+
items:
356+
- name: Management API
357+
href: /python/api/overview/azure/search?view=azure-python
350358
- name: OData language reference
351359
items:
352360
- name: Overview
@@ -373,44 +381,47 @@
373381
href: search-query-odata-search-score-function.md
374382
- name: OData Language Grammar
375383
href: search-query-odata-syntax-reference.md
376-
- name: Cognitive skills reference
377-
href: cognitive-search-predefined-skills.md
384+
- name: Skills reference
378385
items:
379-
- name: Key Phrase Extraction
380-
href: cognitive-search-skill-keyphrases.md
381-
- name: Language Detection
382-
href: cognitive-search-skill-language-detection.md
383-
- name: Entity Recognition
384-
href: cognitive-search-skill-entity-recognition.md
385-
- name: Text Merger
386-
href: cognitive-search-skill-textmerger.md
387-
- name: Text Split
388-
href: cognitive-search-skill-textsplit.md
389-
- name: Sentiment
390-
href: cognitive-search-skill-sentiment.md
391-
- name: Text Translation
392-
href: cognitive-search-skill-text-translation.md
393-
- name: Image Analysis
394-
href: cognitive-search-skill-image-analysis.md
395-
- name: OCR
396-
href: cognitive-search-skill-ocr.md
397-
- name: Shaper
398-
href: cognitive-search-skill-shaper.md
399-
- name: Conditional
400-
href: cognitive-search-skill-conditional.md
401-
- name: Document Extraction
402-
href: cognitive-search-skill-document-extraction.md
403-
- name: PII Detection
404-
href: cognitive-search-skill-pii-detection.md
405-
- name: Custom skills
406-
items:
407-
- name: Custom Web API
408-
href: cognitive-search-custom-skill-web-api.md
409-
- name: Deprecated Skills
410-
href: cognitive-search-skill-deprecated.md
411-
items:
412-
- name: Named Entity Recognition
413-
href: cognitive-search-skill-named-entity-recognition.md
386+
- name: Built-in skills
387+
items:
388+
- name: Overview
389+
href: cognitive-search-predefined-skills.md
390+
- name: Conditional
391+
href: cognitive-search-skill-conditional.md
392+
- name: Document Extraction
393+
href: cognitive-search-skill-document-extraction.md
394+
- name: Entity Recognition
395+
href: cognitive-search-skill-entity-recognition.md
396+
- name: Image Analysis
397+
href: cognitive-search-skill-image-analysis.md
398+
- name: Key Phrase Extraction
399+
href: cognitive-search-skill-keyphrases.md
400+
- name: Language Detection
401+
href: cognitive-search-skill-language-detection.md
402+
- name: OCR
403+
href: cognitive-search-skill-ocr.md
404+
- name: PII Detection
405+
href: cognitive-search-skill-pii-detection.md
406+
- name: Sentiment
407+
href: cognitive-search-skill-sentiment.md
408+
- name: Shaper
409+
href: cognitive-search-skill-shaper.md
410+
- name: Text Merger
411+
href: cognitive-search-skill-textmerger.md
412+
- name: Text Split
413+
href: cognitive-search-skill-textsplit.md
414+
- name: Text Translation
415+
href: cognitive-search-skill-text-translation.md
416+
- name: Custom skills
417+
items:
418+
- name: Custom Web API
419+
href: cognitive-search-custom-skill-web-api.md
420+
- name: Deprecated skills
421+
href: cognitive-search-skill-deprecated.md
422+
items:
423+
- name: Named Entity Recognition
424+
href: cognitive-search-skill-named-entity-recognition.md
414425
- name: Resources
415426
items:
416427
- name: Azure Community Support
@@ -434,4 +445,4 @@
434445
- name: Pricing
435446
href: https://azure.microsoft.com/pricing/details/search/
436447
- name: Videos
437-
href: https://azure.microsoft.com/resources/videos/index/?services=search
448+
href: https://azure.microsoft.com/resources/videos/index/?services=search

articles/search/search-api-preview.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: brjohnstmsft
88
ms.author: brjohnst
99
ms.service: cognitive-search
1010
ms.topic: conceptual
11-
ms.date: 01/04/2020
11+
ms.date: 01/15/2020
1212
---
1313
# Azure Cognitive Search service REST api-version 2019-05-06-Preview
1414

@@ -17,8 +17,11 @@ This article describes the `api-version=2019-05-06-Preview` version of Search se
1717
> [!NOTE]
1818
> Preview features are available for testing and experimentation with the goal of gathering feedback and are subject to change. We strongly advise against using preview APIs in production applications.
1919
20+
## Features in 2019-05-06-Preview
2021

21-
## New in 2019-05-06-Preview
22+
This section lists features having preview status. Most were added in the current 2019-05-06-Preview API, but some like `moreLikeThis` are from earlier preview versions that rolled into the latest preview API.
23+
24+
Once a preview feature becomes generally available, it is removed from this list. You can check [Service Updates](https://azure.microsoft.com/updates/?product=search) or [What's New](whats-new.md) for announcements regarding general availability.
2225

2326
+ [Incremental enrichment(preview)](cognitive-search-incremental-indexing-conceptual.md) adds caching to an enrichment pipeline, allowing you to reuse existing output if a targeted modification, such as an update to a skillset or another object, does not change the content. Caching applies only to enriched documents produced by a skillset.
2427

@@ -28,13 +31,11 @@ This article describes the `api-version=2019-05-06-Preview` version of Search se
2831

2932
+ [Knowledge store](knowledge-store-concept-intro.md) is a new destination of an AI-based enrichment pipeline. The physical data structure exists in Azure Blob storage and Azure Table storage, and it is created and populated when you run an indexer that has an attached cognitive skillset. The definition of a knowledge store itself is specified within a skillset definition. Within the knowledge store definition, you control the physical structures of your data through *projection* elements that determine how data is shaped, whether data is stored in Table storage or Blob storage, and whether there are multiple views.
3033

31-
## Earlier preview features
32-
33-
Features announced in earlier previews are still in public preview. If you're calling an API with an earlier preview api-version, you can continue to use that version or switch to `2019-05-06-Preview` with no changes to expected behavior.
34-
3534
+ [moreLikeThis query parameter](search-more-like-this.md) finds documents that are relevant to a specific document. This feature has been in earlier previews.
3635

37-
+ [CSV blob indexing](search-howto-index-csv-blobs.md) creates one document per line, as opposed to one document per text blob.
36+
## Earlier preview features
37+
38+
Features announced in earlier previews, if they have not transitioned to general availability, are still in public preview. If you're calling an API with an earlier preview api-version, you can continue to use that version or switch to `2019-05-06-Preview` with no changes to expected behavior.
3839

3940
## How to call a preview API
4041

articles/search/search-security-manage-encryption-keys.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ Encryption with customer-managed keys is configured at the index or synonym map
2222
Keys don't all need to be in the same Key Vault. A single search service can host multiple encrypted indexes or synonym maps each encrypted with their own customer-managed encryption keys stored in different Key Vaults. You can also have indexes and synonym maps in the same service that are not encrypted using customer-managed keys.
2323

2424
> [!IMPORTANT]
25-
> This feature is available on the [REST API version 2019-05-06](https://docs.microsoft.com/rest/api/searchservice/) and [.NET SDK version 8.0-preview](search-dotnet-sdk-migration-version-9.md). There is currently no support to configure customer managed encryption keys in the Azure portal.
25+
> This feature is available on the [REST API version 2019-05-06](https://docs.microsoft.com/rest/api/searchservice/) and [.NET SDK version 8.0-preview](search-dotnet-sdk-migration-version-9.md). There is currently no support to configure customer managed encryption keys in the Azure portal. The search service must be created after January 2019 and cannot be a Free (shared) service.
2626
2727
## Prerequisites
2828

2929
The following services are used in this example.
3030

31-
+ [Create an Azure Cognitive Search service](search-create-service-portal.md) or [find an existing service](https://ms.portal.azure.com/#blade/HubsExtension/BrowseResourceBlade/resourceType/Microsoft.Search%2FsearchServices) under your current subscription. The search service must be created after January 2019 and cannot be a Free (shared) service.
31+
+ [Create an Azure Cognitive Search service](search-create-service-portal.md) or [find an existing service](https://ms.portal.azure.com/#blade/HubsExtension/BrowseResourceBlade/resourceType/Microsoft.Search%2FsearchServices) under your current subscription.
3232

3333
+ [Create an Azure Key Vault resource](https://docs.microsoft.com/azure/key-vault/quick-create-portal#create-a-vault) or find an existing vault under your subscription.
3434

0 commit comments

Comments
 (0)