Merge pull request #42342 from HeidiSteen/heidist-master

Azure Search: cleanup after porting preview API to REST API docset

Author: Ja-Dunn

.openpublishing.redirection.json

@@ -7000,6 +7000,16 @@
             "redirect_url": "https://docs.microsoft.com/rest/api/searchservice/add-scoring-profiles-to-a-search-index",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/search/ref-create-indexer.md",
+            "redirect_url": "https://docs.microsoft.com/rest/api/searchservice/create-indexer",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/search/ref-create-skillset.md",
+            "redirect_url": "https://docs.microsoft.com/rest/api/searchservice/create-skillset",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/search/search-api-2017-11-11-preview.md",
             "redirect_url": "/azure/search/search-api-preview",

articles/search/TOC.yml

@@ -219,41 +219,31 @@
     href: http://azure-sdk-for-python.readthedocs.io/en/latest/ref/azure.mgmt.search.html
   - name: REST
     href: /rest/api/searchservice
-    items:
-    - name: 2017-11-11-Preview
-      href: search-api-preview.md
   - name: REST (Management)
     href: /rest/api/searchmanagement
-  - name: Cognitive search (Preview)
+  - name: REST (Preview)
+    href: search-api-preview.md
+  - name: Predefined skills (Preview) 
+    href: cognitive-search-predefined-skills.md
     items:
-    - name: 2017-11-11-Preview (REST)
-      href: search-api-preview.md
-      items:
-      - name: Create Skillset (Preview)
-        href: ref-create-skillset.md
-      - name: Create Indexer (Preview)
-        href: ref-create-indexer.md
-    - name: Predefined skills 
-      href: cognitive-search-predefined-skills.md
-      items:
-      - name: Key Phrase Extraction 
-        href: cognitive-search-skill-keyphrases.md
-      - name: Language Detection
-        href: cognitive-search-skill-language-detection.md
-      - name: Named Entity Recognition
-        href: cognitive-search-skill-named-entity-recognition.md
-      - name: Text Merger
-        href: cognitive-search-skill-textmerger.md
-      - name: Text Split
-        href: cognitive-search-skill-textsplit.md 
-      - name: Sentiment
-        href: cognitive-search-skill-sentiment.md
-      - name: Image Analysis
-        href: cognitive-search-skill-image-analysis.md
-      - name: Ocr
-        href: cognitive-search-skill-ocr.md
-      - name: Shaper
-        href: cognitive-search-skill-shaper.md
+    - name: Key Phrase Extraction 
+      href: cognitive-search-skill-keyphrases.md
+    - name: Language Detection
+      href: cognitive-search-skill-language-detection.md
+    - name: Named Entity Recognition
+      href: cognitive-search-skill-named-entity-recognition.md
+    - name: Text Merger
+      href: cognitive-search-skill-textmerger.md
+    - name: Text Split
+      href: cognitive-search-skill-textsplit.md 
+    - name: Sentiment
+      href: cognitive-search-skill-sentiment.md
+    - name: Image Analysis
+      href: cognitive-search-skill-image-analysis.md
+    - name: Ocr
+      href: cognitive-search-skill-ocr.md
+    - name: Shaper
+      href: cognitive-search-skill-shaper.md
 - name: Resources
   items:
   - name: FAQ - Frequently Asked Questions

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

@@ -120,5 +120,5 @@ Note that the cardinality of `"/document/people/*/lastname"` is larger than that
 ## See also
 + [How to integrate a custom skill into an enrichment pipeline](cognitive-search-custom-skill-interface.md)
 + [How to define a skillset](cognitive-search-defining-skillset.md)
-+ [Create Skillset (REST)](ref-create-skillset.md)
++ [Create Skillset (REST)](https://docs.microsoft.com/rest/api/searchservice/create-skillset)
 + [How to map enriched fields to an index](cognitive-search-output-field-mapping.md)

articles/search/cognitive-search-concept-image-scenarios.md

@@ -40,7 +40,7 @@ Set the **parsingMode** parameter to `json` (to index each blob as a single docu
 The default of 2000 pixels for the normalized images maximum width and height is based on the maximum sizes supported by the [OCR skill](cognitive-search-skill-ocr.md) and the [image analysis skill](cognitive-search-skill-image-analysis.md). If you increase the maximum limits, processing could fail on the larger images.
 
 
-You specify the imageAction in your [indexer definition](ref-create-indexer.md) as follows:
+You specify the imageAction in your [indexer definition](https://docs.microsoft.com/rest/api/searchservice/create-indexer) as follows:
 
 ```json
 {
@@ -213,7 +213,7 @@ As a helper, if you need to transform normalized coordinates to the original coo
 ```
 
 ## See also
-+ [Create indexer (REST)](ref-create-indexer.md)
++ [Create indexer (REST)](https://docs.microsoft.com/rest/api/searchservice/create-indexer)
 + [Analyze image skill](cognitive-search-skill-image-analysis.md)
 + [OCR skill](cognitive-search-skill-ocr.md)
 + [Text merge skill](cognitive-search-skill-textmerger.md)

articles/search/cognitive-search-concept-intro.md

@@ -98,21 +98,21 @@ Currently, only REST APIs are provided. Use `api-version=2017-11-11-Preview` on
 | REST API | Description |
 |-----|-------------|
 | [Create Data Source](https://docs.microsoft.com/rest/api/searchservice/create-data-source)  | A resource identifying an external data source providing source data used to create enriched documents.  |
-| [Create Skillset (api-version=2017-11-11-Preview)](ref-create-skillset.md)  | A resource coordinating the use of [predefined skills](cognitive-search-predefined-skills.md) and [custom cognitive skills](cognitive-search-custom-skill-interface.md) used in an enrichment pipeline during indexing. |
+| [Create Skillset (api-version=2017-11-11-Preview)](https://docs.microsoft.com/rest/api/searchservice/create-skillset)  | A resource coordinating the use of [predefined skills](cognitive-search-predefined-skills.md) and [custom cognitive skills](cognitive-search-custom-skill-interface.md) used in an enrichment pipeline during indexing. |
 | [Create Index](https://docs.microsoft.com/rest/api/searchservice/create-index)  | A schema expressing an Azure Search index. Fields in the index map to fields in source data or to fields manufactured during the enrichment phase (for example, a field for organization names created by entity recognition). |
-| [Create Indexer (api-version=2017-11-11-Preview)](ref-create-skillset.md)  | A resource defining components used during indexing: including a data source, a skillset, field associations from source and intermediary data structures to target index, and the index itself. Running the indexer is the trigger for data ingestion and enrichment. The output is a search corpus based on the index schema, populated with source data, enriched through skillsets.  |
+| [Create Indexer (api-version=2017-11-11-Preview)](https://docs.microsoft.com/rest/api/searchservice/create-skillset)  | A resource defining components used during indexing: including a data source, a skillset, field associations from source and intermediary data structures to target index, and the index itself. Running the indexer is the trigger for data ingestion and enrichment. The output is a search corpus based on the index schema, populated with source data, enriched through skillsets.  |
 
 **Checklist: A typical workflow**
 
 1. Subset your Azure source data into a representative sample. Indexing takes time so start with a small, representative data set and then build it up incrementally as your solution matures.
 
 1. Create a [data source object](https://docs.microsoft.com/rest/api/searchservice/create-data-source) in Azure Search to provide a connection string for data retrieval.
 
-1. Create a [skillset](ref-create-skillset.md) with enrichment steps.
+1. Create a [skillset](https://docs.microsoft.com/rest/api/searchservice/create-skillset) with enrichment steps.
 
 1. Define the [index schema](https://docs.microsoft.com/rest/api/searchservice/create-index). The *Fields* collection includes fields from source data. You should also stub out additional fields to hold generated values for content created during enrichment.
 
-1. Define the [indexer](ref-create-skillset.md) referencing the data source, skillset, and index.
+1. Define the [indexer](https://docs.microsoft.com/rest/api/searchservice/create-skillset) referencing the data source, skillset, and index.
 
 1. Within the indexer, add *outputFieldMappings*. This section maps output from the skillset (in step 3) to the inputs fields in the index schema (in step 4).
 

articles/search/cognitive-search-create-custom-skill-example.md

@@ -318,5 +318,5 @@ Congratulations! You have created your first custom enricher. Now you can follow
 
 + [Add a custom skill to a cognitive search pipeline](cognitive-search-custom-skill-interface.md)
 + [How to define a skillset](cognitive-search-defining-skillset.md)
-+ [Create Skillset (REST)](ref-create-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-custom-skill-interface.md

@@ -142,5 +142,5 @@ When you create a Web API enricher, you can describe HTTP headers and parameters
 
 + [Example: Creating a custom skill for the Translate Text API](cognitive-search-create-custom-skill-example.md)
 + [How to define a skillset](cognitive-search-defining-skillset.md)
-+ [Create Skillset (REST)](ref-create-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-defining-skillset.md

@@ -47,7 +47,7 @@ In the diagram, the *document cracking* step happens automatically. Essentially,
 
 ## Skillset definition in REST
 
-A skillset is defined as an array of skills. Each skill defines the source of its inputs and the name of the outputs produced. Using the [Create Skillset REST API](ref-create-skillset.md), you can define a skillset that corresponds to the previous diagram: 
+A skillset is defined as an array of skills. Each skill defines the source of its inputs and the name of the outputs produced. Using the [Create Skillset REST API](https://docs.microsoft.com/rest/api/searchservice/create-skillset), you can define a skillset that corresponds to the previous diagram: 
 
 ```http
 PUT https://[servicename].search.windows.net/skillsets/[skillset name]?api-version=2017-11-11-Preview

articles/search/cognitive-search-resources-documentation.md

@@ -46,8 +46,8 @@ The following articles are the complete documentation for cognitive search.
   + [Microsoft.Skills.Util.ShaperSkill](cognitive-search-skill-shaper.md)
 
 + [Preview REST API](search-api-2017-11-11-preview.md)
-  + [Create Skillset (api-version=2017-11-11-Preview)](ref-create-skillset.md)
-  + [Create Indexer (api-version=2017-11-11-Preview)](ref-create-indexer.md)
+  + [Create Skillset (api-version=2017-11-11-Preview)](https://docs.microsoft.com/rest/api/searchservice/create-skillset)
+  + [Create Indexer (api-version=2017-11-11-Preview)](https://docs.microsoft.com/rest/api/searchservice/create-indexer)
 
 ## See also
 

articles/search/cognitive-search-skill-image-analysis.md

@@ -244,4 +244,4 @@ In the following error cases, no elements are extracted.
 
 + [Predefined skills](cognitive-search-predefined-skills.md)
 + [How to define a skillset](cognitive-search-defining-skillset.md)
-+ [Create Indexer (REST)](ref-create-indexer.md)
++ [Create Indexer (REST)](https://docs.microsoft.com/rest/api/searchservice/create-indexer)