Merge pull request #92991 from HeidiSteen/revert-92831-heidist-ignite-sync

Revert "Writer sync master to release-ignite branch"

Author: ktoliver

articles/search/TOC.yml

@@ -1,24 +1,20 @@
-- name: Azure Cognitive Search Documentation
+- name: Azure Search Documentation
   href: index.yml
 - name: Overview
-  expanded: true
   items:
-  - name: What is Azure Cognitive Search?
+  - name: What is Azure Search?
     href: search-what-is-azure-search.md
-  - name: What's new
-    href: whats-new.md
 - name: Quickstarts
+  expanded: true
   items:
   - name: Create a service
     href: search-create-service-portal.md
   - name: Portal
     items:
-    - name: Create a search index
+    - name: Create and use an index
       href: search-get-started-portal.md
-    - name: Create a cognitive skillset
+    - name: Enrich with cognitive search (AI)
       href: cognitive-search-quickstart-blob.md
-    - name: Create a knowledge store
-      href: knowledge-store-create-portal.md
   - name: C#
     href: search-get-started-dotnet.md
   - name: Java
@@ -83,16 +79,14 @@
   items:
   - name: Full-text search
     href: search-lucene-query-architecture.md
-  - name: AI enrichment
+  - name: Cognitive search
     href: cognitive-search-concept-intro.md
   - name: Skillsets
     href: cognitive-search-working-with-skillsets.md
   - name: Knowledge store 
     href: knowledge-store-concept-intro.md
   - name: Projections
     href: knowledge-store-projection-overview.md
-  - name: Incremental indexing
-    href: cognitive-search-incremental-indexing-conceptual.md
 - name: How-to guides
   items:
   - name: Planning
@@ -215,8 +209,6 @@
       href: search-howto-schedule-indexers.md
     - name: Map fields
       href: search-indexer-field-mappings.md
-    - name: Incremental indexing
-      href: search-howto-incremental-index.md
     - name: Connect to SQL Managed Instance
       href: search-howto-connecting-azure-sql-mi-to-azure-search-using-indexers.md
     - name: Connect to SQL Server VMs
@@ -255,6 +247,8 @@
       href: cognitive-search-resources-documentation.md
     - name: Knowledge store (preview)
       items:
+      - name: Create a knowledge store in Azure portal
+        href: knowledge-store-create-portal.md
       - name: Create using REST and Postman
         href: knowledge-store-create-rest.md
       - name: View with Storage Explorer

articles/search/cognitive-search-attach-cognitive-services.md

@@ -1,68 +1,67 @@
 ---
-title: Attach a Cognitive Services resource to a skillset
-titleSuffix: Azure Cognitive Search
-description: Instructions for attaching a Cognitive Services all-in-one subscription to an AI enrichment pipeline in Azure Cognitive Search.
-
+title: Attach a Cognitive Services resource with a skillset - Azure Search
+description: Instructions for attaching a Cognitive Services all-in-one subscription to a cognitive enrichment pipeline in Azure Search.
 manager: nitinme
 author: LuisCabrer
-ms.author: luisca
-ms.service: cognitive-search
+services: search
+ms.service: search
 ms.topic: conceptual
-ms.date: 11/04/2019
+ms.date: 05/20/2019
+ms.author: luisca
 ---
-# Attach a Cognitive Services resource to a skillset in Azure Cognitive Search 
+# Attach a Cognitive Services resource with a skillset in Azure Search 
 
-AI algorithms drive the [enrichment pipelines](cognitive-search-concept-intro.md) used for content transformation in Azure Cognitive Search. These algorithms are based on Azure Cognitive Services resources, including [Computer Vision](https://azure.microsoft.com/services/cognitive-services/computer-vision/) for image analysis and optical character recognition (OCR) and [Text Analytics](https://azure.microsoft.com/services/cognitive-services/text-analytics/) for entity recognition, key phrase extraction, and other enrichments. As used by Azure Cognitive Search for document enrichment purposes, the algorithms are wrapped inside a *skill*, placed in a *skillset*, and referenced by an *indexer* during indexing.
+AI algorithms drive the [cognitive indexing pipelines](cognitive-search-concept-intro.md) used for document enrichment in Azure Search. These algorithms are based on Azure Cognitive Services resources, including [Computer Vision](https://azure.microsoft.com/services/cognitive-services/computer-vision/) for image analysis and optical character recognition (OCR) and [Text Analytics](https://azure.microsoft.com/services/cognitive-services/text-analytics/) for entity recognition, key phrase extraction, and other enrichments. As used by Azure Search for document enrichment purposes, the algorithms are wrapped inside a *skill*, placed in a *skillset*, and referenced by an *indexer* during indexing.
 
-You can enrich a limited number of documents for free. Or, you can attach a billable Cognitive Services resource to a *skillset* for larger and more frequent workloads. In this article, you'll learn how to attach a billable Cognitive Services resource to enrich documents during Azure Cognitive Search [indexing](search-what-is-an-index.md).
+You can enrich a limited number of documents for free. Or, you can attach a billable Cognitive Services resource to a *skillset* for larger and more frequent workloads. In this article, you'll learn how to attach a billable Cognitive Services resource to enrich documents during Azure Search [indexing](search-what-is-an-index.md).
 
 > [!NOTE]
-> Billable events include calls to Cognitive Services APIs and image extraction as part of the document-cracking stage in Azure Cognitive Search. There is no charge for text extraction from documents or for skills that do not call Cognitive Services.
+> Billable events include calls to Cognitive Services APIs and image extraction as part of the document-cracking stage in Azure Search. There is no charge for text extraction from documents or for skills that do not call Cognitive Services.
 >
-> Execution of billable skills is at the [Cognitive Services pay-as-you go price](https://azure.microsoft.com/pricing/details/cognitive-services/). For image extraction pricing, see the [Azure Cognitive Search pricing page](https://go.microsoft.com/fwlink/?linkid=2042400).
+> Execution of billable skills is at the [Cognitive Services pay-as-you go price](https://azure.microsoft.com/pricing/details/cognitive-services/). For image extraction pricing, see the [Azure Search pricing page](https://go.microsoft.com/fwlink/?linkid=2042400).
 
 ## Same-region requirement
 
-We require that Azure Cognitive Search and Azure Cognitive Services exist within the same region. Otherwise, you will get this message at run time: `"Provided key is not a valid CognitiveServices type key for the region of your search service."` 
+We require that Azure Search and Azure Cognitive Services exist within the same region. Otherwise, you will get this message at run time: `"Provided key is not a valid CognitiveServices type key for the region of your search service."` 
 
-There is no way to move a service across regions. If you get this error, you should create a new Cognitive Services resource in the same region as Azure Cognitive Search.
+There is no way to move a service across regions. If you get this error, you should create a new Cognitive Services resource in the same region as Azure Search.
 
 > [!NOTE]
-> Some built-in skills are based on non-regional Cognitive Services (for example, the [Text Translation Skill](cognitive-search-skill-text-translation.md)). Be aware that if you add any of these skills to your skillset that your data is not guaranteed to stay in the same region as your Azure Cognitive Search or Cognitive Services resource. See the [service status page](https://aka.ms/allinoneregioninfo) for more details.
+> Some built-in skills are based on non-regional Cognitive Services (for example, the [Text Translation Skill](cognitive-search-skill-text-translation.md)). Be aware that if you add any of these skills to your skillset that your data is not guaranteed to stay in the same region as your Azure Search or Cognitive Services resource. See the [service status page](https://aka.ms/allinoneregioninfo) for more details.
 
 ## Use Free resources
 
-You can use a limited, free processing option to complete the AI enrichment tutorial and quickstart exercises.
+You can use a limited, free processing option to complete the cognitive search tutorial and quickstart exercises.
 
 Free (Limited enrichments) resources are restricted to 20 documents per day, per subscription.
 
 1. Open the Import data wizard:
 
    ![Open the Import data wizard](media/search-get-started-portal/import-data-cmd.png "Open the Import data wizard")
 
-1. Choose a data source and continue to **Add AI enrichment (Optional)**. For a step-by-step walkthrough of this wizard, see [Create an index in the Azure portal](search-get-started-portal.md).
+1. Choose a data source and continue to **Add cognitive search (Optional)**. For a step-by-step walkthrough of this wizard, see [Import, index, and query by using portal tools](search-get-started-portal.md).
 
 1. Expand **Attach Cognitive Services** and then select **Free (Limited enrichments)**:
 
    ![Expanded Attach Cognitive Services section](./media/cognitive-search-attach-cognitive-services/attach1.png "Expanded Attach Cognitive Services section")
 
-1. You can now continue on to the next steps,  including **Add cognitive skills**.
+1. Continue to the next step, **Add Enrichments**. For a description of skills available in the portal, see [Step 2: Add cognitive skills](cognitive-search-quickstart-blob.md#create-the-enrichment-pipeline) in the cognitive search quickstart.
 
 ## Use billable resources
 
 For workloads that create more than 20 enrichments per day, make sure to attach a billable Cognitive Services resource. We recommend that you always attach a billable Cognitive Services resource, even if you never intend to call Cognitive Services APIs. Attaching a resource overrides the daily limit.
 
 You're charged only for skills that call the Cognitive Services APIs. You're not billed for [custom skills](cognitive-search-create-custom-skill-example.md), or skills like [text merger](cognitive-search-skill-textmerger.md), [text splitter](cognitive-search-skill-textsplit.md), and [shaper](cognitive-search-skill-shaper.md), which aren't API-based.
 
-1. Open the Import data wizard, choose a data source, and continue to **Add AI enrichment (Optional)**.
+1. Open the Import data wizard, choose a data source, and continue to **Add cognitive search (Optional)**.
 
 1. Expand **Attach Cognitive Services** and then select **Create new Cognitive Services resource**. A new tab opens so that you can create the resource:
 
    ![Create a Cognitive Services resource](./media/cognitive-search-attach-cognitive-services/cog-services-create.png "Create a Cognitive Services resource")
 
-1. In the **Location** list, select the region where your Azure Cognitive Search service is located. Make sure to use this region for performance reasons. Using this region also voids outbound bandwidth charges across regions.
+1. In the **Location** list, select the region where your Azure Search service is located. Make sure to use this region for performance reasons. Using this region also voids outbound bandwidth charges across regions.
 
-1. In the **Pricing tier** list, select **S0** to get the all-in-one collection of Cognitive Services features, including the Vision and Language features that back the built-in skills provided by Azure Cognitive Search.
+1. In the **Pricing tier** list, select **S0** to get the all-in-one collection of Cognitive Services features, including the Vision and Language features that back the predefined skills used by Azure Search.
 
    For the S0 tier, you can find rates for specific workloads on the [Cognitive Services pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/).
 
@@ -76,7 +75,7 @@ You're charged only for skills that call the Cognitive Services APIs. You're not
 
    ![Select the Cognitive Services resource](./media/cognitive-search-attach-cognitive-services/attach2.png "Select the Cognitive Services resource")
 
-1. Expand the **Add cognitive skills** section to select the specific cognitive skills that you want to run on your data. Complete the rest of the wizard.
+1. Expand the **Add Enrichments** section to select the specific cognitive skills that you want to run on your data. Complete the rest of the wizard. For a description of skills available in the portal, see [Step 2: Add cognitive skills](cognitive-search-quickstart-blob.md#create-the-enrichment-pipeline) in the cognitive search quickstart.
 
 ## Attach an existing skillset to a Cognitive Services resource
 
@@ -94,7 +93,7 @@ If you have an existing skillset, you can attach it to a new or different Cognit
 
 ## Attach Cognitive Services programmatically
 
-When you're defining the skillset programmatically, add a `cognitiveServices` section to the skillset. In that section, include the key of the Cognitive Services resource that you want to associate with the skillset. Remember that the resource must be in the same region as your Azure Cognitive Search resource. Also include `@odata.type`, and set it to `#Microsoft.Azure.Search.CognitiveServicesByKey`.
+When you're defining the skillset programmatically, add a `cognitiveServices` section to the skillset. In that section, include the key of the Cognitive Services resource that you want to associate with the skillset. Remember that the resource must be in the same region as your Azure Search resource. Also include `@odata.type`, and set it to `#Microsoft.Azure.Search.CognitiveServicesByKey`.
 
 The following example shows this pattern. Notice the `cognitiveServices` section at the end of the definition.
 
@@ -154,7 +153,7 @@ The prices shown in this article are hypothetical. They're used to illustrate th
 Putting it all together, you'd pay about $57.00 to ingest 1,000 PDF documents of this type with the described skillset.
 
 ## Next steps
-+ [Azure Cognitive Search pricing page](https://azure.microsoft.com/pricing/details/search/)
++ [Azure Search pricing page](https://azure.microsoft.com/pricing/details/search/)
 + [How to define a skillset](cognitive-search-defining-skillset.md)
 + [Create Skillset (REST)](https://docs.microsoft.com/rest/api/searchservice/create-skillset)
 + [How to map enriched fields](cognitive-search-output-field-mapping.md)

articles/search/cognitive-search-common-errors-warnings.md

@@ -1,19 +1,20 @@
 ---
-title: Common Errors and Warnings
-titleSuffix: Azure Cognitive Search
-description: This article provides information and solutions to common errors and warnings you might encounter during AI enrichment in Azure Cognitive Search.
-
-manager: nitinme
+title: Common Errors and Warnings - Azure Search
+description: This article provides information and solutions to common errors and warnings you might encounter during AI enrichment in Azure Search.
+services: search
+manager: heidist
 author: amotley
-ms.author: abmotley
-ms.service: cognitive-search
+
+ms.service: search
+ms.workload: search
 ms.topic: conceptual
-ms.date: 11/04/2019
+ms.date: 09/18/2019
+ms.author: abmotley
 ---
 
-# Common errors and warnings of the AI enrichment pipeline in Azure Cognitive Search
+# Common errors and warnings of the AI enrichment pipeline in Azure Search
 
-This article provides information and solutions to common errors and warnings you might encounter during AI enrichment in Azure Cognitive Search.
+This article provides information and solutions to common errors and warnings you might encounter during AI enrichment in Azure Search.
 
 ## Errors
 Indexing stops when the error count exceeds ['maxFailedItems'](cognitive-search-concept-troubleshooting.md#tip-3-see-what-works-even-if-there-are-some-failures). 

articles/search/cognitive-search-concept-annotations-syntax.md

@@ -1,16 +1,17 @@
 ---
-title: Reference inputs and outputs in an AI enrichment pipeline
-titleSuffix: Azure Cognitive Search
-description: Explains the annotation syntax and how to reference an annotation in the inputs and outputs of a skillset in an AI enrichment pipeline in Azure Cognitive Search.
-
+title: Reference inputs and outputs in cognitive search pipelines - Azure Search
+description: Explains the annotation syntax and how to reference an annotation in the inputs and outputs of a skillset in a cognitive search pipeline in Azure Search.
+services: search
 manager: nitinme
-author: LuisCabrer
-ms.author: luisca
-ms.service: cognitive-search
+author: luiscabrer
+
+ms.service: search
+ms.workload: search
 ms.topic: conceptual
-ms.date: 11/04/2019
+ms.date: 05/02/2019
+ms.author: luisca
 ---
-# How to reference annotations in an Azure Cognitive Search skillset
+# How to reference annotations in a cognitive search skillset
 
 In this article, you learn how to reference annotations in skill definitions, using examples to illustrate various scenarios. As the content of a document flows through a set of skills, it gets enriched with annotations. Annotations can be  used as inputs for further downstream enrichment, or mapped to an output field in an index.