Merge branch 'master' into users/kaelli/custom-wit-update

.openpublishing.redirection.json

@@ -18071,13 +18071,18 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "docs/boards/backlogs/filter-backlogs.md",
-      "redirect_url": "/azure/devops/boards/backlogs/filter-backlogs-boards-plans",
-      "redirect_document_id": true
+      "source_path": "docs/project/search/index.md",
+      "redirect_url": "/azure/devops/project/search/get-started-search",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/project/search/overview.md",
+      "redirect_url": "/azure/devops/project/search/get-started-search",
+      "redirect_document_id": false
     },
     {
-      "source_path": "docs/boards/boards/filter-kanban-board.md",
-      "redirect_url": "/azure/devops/boards/backlogs/filter-backlogs-boards-plans",
+      "source_path": "docs/project/navigation/search-basics.md",
+      "redirect_url": "/azure/devops/project/search/get-started-search",
       "redirect_document_id": false
     },
     {
@@ -18090,6 +18095,36 @@
       "redirect_url": "/azure/devops/migrate/migration",
       "redirect_document_id": true
     },
+    {
+      "source_path": "docs/project/search/administration.md",
+      "redirect_url": "/azure/devops/project/search/get-started-search",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/project/search/advanced-package-syntax.md",
+      "redirect_url": "/azure/devops/project/search/functional-code-search",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/project/search/advanced-work-item-search-syntax.md",
+      "redirect_url": "/azure/devops/project/search/functional-work-item-search",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/project/search/code-search.md",
+      "redirect_url": "/azure/devops/project/search/get-started-search",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/project/search/package-search.md",
+      "redirect_url": "/azure/devops/project/search/get-started-search",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/project/search/work-item-search.md",
+      "redirect_url": "/azure/devops/project/search/get-started-search",
+      "redirect_document_id": true
+    },
     {
       "source_path": "docs/organizations/security/set-git-tfvc-repository-permissions.md",
       "redirect_url": "/azure/devops/repos/git/set-git-repository-permissions",

docs/artifacts/toc.yml

@@ -13,7 +13,7 @@
   - name: Best practices
     href: concepts/best-practices.md
   - name: Search packages
-    href: ../project/search/package-search.md?toc=/azure/devops/artifacts/toc.json&bc=/azure/devops/artifacts/breadcrumb/toc.json
+    href: ../project/search/functional-package-search.md?toc=/azure/devops/artifacts/toc.json&bc=/azure/devops/artifacts/breadcrumb/toc.json
 - name: Work with packages
   items:
   - name: About packages

docs/boards/backlogs/add-link.md

@@ -135,7 +135,7 @@ For example, here we use the **Related** link type to link three items to the bu
 To link to multiple work items, you can use inline add which finds work items based on your recent activity or keyword searches. Simply select one or more of the work items displayed automatically based on your recent activity, or enter a keyword. Keyword searches will display work items based on work items that include that keyword in their title. 
 
 > [!NOTE]   
-> You need to add each link one at a time. (You can no longer enter their IDs separated by commas or spaces.) To quickly find work items of interest, you can also use [work item search](../../project/search/work-item-search.md).
+> You need to add each link one at a time. (You can no longer enter their IDs separated by commas or spaces.) To quickly find work items of interest, you can also use [work item search](../../project/search/functional-work-item-search.md).
 
 ::: moniker-end 
 

docs/boards/backlogs/filter-backlogs-boards-plans.md

@@ -254,7 +254,7 @@ Supported options are indicated with a ✔️ or listed.
 ::: moniker range=">= azure-devops-2019"
 :::row:::
    :::column span="1.5":::
-     [**Semantic search, Work Items**](../../project/search/work-item-search.md)
+     [**Semantic search, Work Items**](../../project/search/functional-work-item-search.md)
    :::column-end:::
    :::column span="1":::
       ✔️   
@@ -492,7 +492,7 @@ In addition to the standard filter functions summarized in the previous table, t
 ---
 :::row:::
    :::column span="2":::
-     [**Semantic search, Work Items**](../../project/search/work-item-search.md)
+     [**Semantic search, Work Items**](../../project/search/functional-work-item-search.md)
    :::column-end:::
    :::column span="2":::
 
@@ -693,7 +693,7 @@ In addition to the standard filter functions summarized in the previous table, t
 ::: moniker range=">= tfs-2017 < azure-devops-2020"
 :::row:::
    :::column span="2":::
-     [**Semantic search, Work Items**](../../project/search/work-item-search.md)
+     [**Semantic search, Work Items**](../../project/search/functional-work-item-search.md)
    :::column-end:::
    :::column span="2":::
 

docs/boards/includes/feature-matrix-filter-queries.md

@@ -13,7 +13,7 @@ The following table summarizes the query filter functions supported by each Azur
 
 ::: moniker range=">= azure-devops-2019"
 > [!NOTE] 
-> Managed queries don't support proximity searches, however semantic searches do. In addition, semantic searches supports both `*` and `?` as wildcard characters and you can use more than one wildcard character to match more than one character. To learn more, see [Advanced work items search](/azure/devops/project/search/advanced-work-item-search-syntax).
+> Managed queries don't support proximity searches, however semantic searches do. In addition, semantic searches support both `*` and `?` as wildcard characters and you can use more than one wildcard character to match more than one character. To learn more, see [Functional work items search](../../project/search/functional-work-item-search.md).
 ::: moniker-end
 
 ---

docs/boards/queries/about-managed-queries.md

@@ -63,60 +63,6 @@ Work item queries only support querying of work items and work items linked to o
 - List work items linked from one project to another.  
 - Export a cross-project query to Excel. Direct links queries export to Excel as a flat-list. 
 
-<a id="ad-hoc-v-managed" /> 
-<a id="semantic-v-managed" /> 
-
-## Managed work item queries versus semantic searches
-
-You have two ways to find and list work items: managed queries and semantic searches. If you are looking for a single work item, use the search box. If you want to generate a list of work items to triage, update, chart, or share with others, use a managed query.
-
-> [!NOTE]    
-> With semantic search, you search against a more fully indexed set of fields than that of managed queries.  
-
-
-
----
-:::row:::
-   :::column span="1":::
-      **Use a managed query**
-   :::column-end:::
-   :::column span="1":::
-      **Use a semantic search**
-   :::column-end:::
-:::row-end:::
----
-:::row:::
-   :::column span="1":::
-      - List items to perform bulk updates to fields  
-      - Review work that's in progress or recently closed    
-      - Triage work (set priority, review, update)  
-      - Create a chart and add it to a dashboard    
-      - Create a chart to get a count of items or sum a field    
-      - Create a chart that shows a burndown or burnup over time   
-      - View a tree of parent-child related work items   
-      - List work items with link relationships    
-      - List work items for a single project, multiple projects, or across all projects.    
-   :::column-end:::
-   :::column span="1":::
-      - Find a specific work item using its ID or a keyword   
-      - Find one or more work items across all projects in a fast, flexible manner  
-      - Perform full text search across all work item fields  
-      - Review work items assigned to a specific team member  
-      - Search against specific work item fields to quickly narrow down a list of work items  
-      - Determine what key words will support a managed search  
-      - List work items for a single project, multiple projects, or across all projects.    
-   :::column-end:::
-:::row-end:::
----
-
-To get started, see the following articles:  
-- [View and run a query](view-run-query.md)   
-- [Use semantic search](search-box-queries.md)  
-- [Define a query](using-queries.md)   
-
-For specific managed query examples, see [Query quick reference, Example queries](query-index-quick-ref.md).  
-
-
 ## Query types (flat, direct links, tree)
 
 Azure Boards supports three query types. The icon next to each query indicates the query type. Use the following guidance to choose the query type based on what you want to accomplish with the query. 

docs/boards/queries/history-and-auditing.md

@@ -62,7 +62,7 @@ The **Query Editor** isn't available when you are connected to a GitHub or third
 ## List items based on the contents of the History field  
 
 ::: moniker range=">= tfs-2017"
-You use the query editor to add the **History** field to a [query clause](using-queries.md). Comments entered into the **Discussion** area are queryable. Change history entries, such as which fields were changed, aren't queryable. To quickly find items based on words entered into the Discussion area, or **Description** or other rich-text fields, consider using [work item search](../../project/search/work-item-search.md).
+You use the query editor to add the **History** field to a [query clause](using-queries.md). Comments entered into the **Discussion** area are queryable. Change history entries, such as which fields were changed, aren't queryable. To quickly find items based on words entered into the Discussion area, or **Description** or other rich-text fields, consider using [work item search](../../project/search/functional-work-item-search.md).
 ::: moniker-end
 
 ::: moniker range=">= tfs-2013 <= tfs-2015"

docs/boards/queries/query-faqs.yml

@@ -27,7 +27,7 @@ sections:
 
       - question: What's the difference between a query and a semantic search? 
         answer: |
-          While both query and search finds and list work items, the filter features and result presentation are different. To learn more, see [About managed queries, Managed work item queries versus semantic searches](about-managed-queries.md#semantic-v-managed).  
+          While both query and search finds and list work items, the filter features and result presentation are different. To learn more, see [About managed queries](about-managed-queries.md).  
 
       - question: Can I export a query and import to another project?  
         answer: |

docs/boards/queries/search-box-queries.md

@@ -28,7 +28,7 @@ You can find work items using shortcut filters or by specifying keywords or phra
 - Search against specific work item fields to quickly narrow down a list of work items
 - Determine what key words will support a managed search
 
-You can perform a powerful [semantic search](#start-search) from the web portal for Azure DevOps Services or TFS 2017.2 or later versions when the [server instance has been configured with the work item search extension](../../project/search/administration.md).
+You can perform a powerful [semantic search](#start-search) from the web portal for Azure DevOps Services or TFS 2017.2 or later versions when the [server instance has been configured with the work item search extension](../../project/search/get-started-search.md).
 
 For TFS 2017.1 and earlier versions, or where the work item search extension hasn't been configured, you can perform [semantic searches](#initiate-an-ad-hoc-search-use-shortcut-filters). With semantic search, you search against a fully indexed set of fields.  
 
@@ -54,18 +54,17 @@ Free text search easily searches across all work item fields, including custom f
 
 1. Choose any **Boards** page, enter a keyword or phrase in the search box, and press *Enter* or choose the :::image type="icon" source="../../project/search/media/shared/start-search-icon.png" border="false"::: start search icon. 
 
-    > [!div class="mx-imgBorder"]
-    > ![Work Item Search box](../../project/navigation/media/search/work-item-search-vert.png)    
+   :::image type="content" source="../../project/search/media/get-started/work-item-search-vert.png" alt-text="Work Item Search box":::
 
-1. Search results are displayed in a snippet view where the matches found are shown in bold.
+2. Search results are displayed in a snippet view where the matches found are shown in bold.
 
    ![Search results](../../project/search/media/work-item-search-get-started/results-matching.png)
 
    This is a full text search that uses simple search strings for words or phrases.
    Work item search matches derived forms of your search terms; for example, a search for
    "updating" will also find instances of the word "updated" and "update". Note that searches are _not_ case-sensitive.
 
-2. Select a snippet of a work item to display it in the right window. 
+3. Select a snippet of a work item to display it in the right window. 
 
    Open the search results in a new browser tab from a search box by
    pressing _Ctrl_ + _Enter_ or by holding _Ctrl_ and clicking  the
@@ -120,8 +119,7 @@ Semantic search isn't supported for TFS 2017.1 and earlier versions. You can sti
 1. Fine-tune your search by specifying the fields to search. Enter `a:` and a user name
    to search for all items assigned to that user.
 
-    > [!div class="mx-imgBorder"]  
-    > ![Search from the title bar](../../project/navigation/media/search/search-work-vert.png)    
+   :::image type="content" source="../../project/search/media/get-started/search-work-vert.png" alt-text="Search from the title bar":::   
 
    The quick filters you can use are:
 
@@ -130,20 +128,20 @@ Semantic search isn't supported for TFS 2017.1 and earlier versions. You can sti
    * `s:` for **State** 
    * `t:` for **Work item type**<p />
 
-1. Start typing the name of a field in your work items; for example, type `ta`.
+2. Start typing the name of a field in your work items; for example, type `ta`.
 
    ![Quick filters as you type](../../project/search/media/work-item-search-get-started/dyna-dropdown.png)    
 
    The dropdown list shows work item field name suggestions 
    that match user input thereby helping the user to complete the search faster. For example, a search such as 
    `tags:Critical` finds all work items tagged "Critical". 
 
-1. Add more filters to further narrow your search, and use Boolean operators
+3. Add more filters to further narrow your search, and use Boolean operators
    to combine terms if required. For example, 
    `a: Chris t: Bug s: Active` finds all active bugs assigned
    to a user named "Chris".
 
-1. Narrow your search to specific types
+4. Narrow your search to specific types
    and states, by using the drop-down selector lists at the top of the results page.
 
 
@@ -154,8 +152,7 @@ Semantic search isn't supported for TFS 2017.1 and earlier versions. You can sti
 1. Fine-tune your search by specifying the fields to search. Enter `a:` and a user name
    to search for all items assigned to that user.
 
-    > [!div class="mx-imgBorder"]  
-    > ![Search from the title bar](../../project/navigation/media/search/work-item-search-filters.png)    
+   :::image type="content" source="../../project/search/media/get-started/work-item-search-filters.png" alt-text="Title bar Search":::
 
    The quick filters you can use are:
 
@@ -164,20 +161,20 @@ Semantic search isn't supported for TFS 2017.1 and earlier versions. You can sti
    * `s:` for **State** 
    * `t:` for **Work item type**<p />
 
-1. Start typing the name of a field in your work items; for example, type `ta`.
+2. Start typing the name of a field in your work items; for example, type `ta`.
 
    ![Quick filters as you type](../../project/search/media/work-item-search-get-started/dyna-dropdown.png)    
 
    The dropdown list shows work item field name suggestions 
    that match user input thereby helping the user to complete the search faster. For example, a search such as 
    `tags:Critical` finds all work items tagged "Critical". 
 
-1. Add more filters to further narrow your search, and use Boolean operators
+3. Add more filters to further narrow your search, and use Boolean operators
    to combine terms if required. For example, 
    `a: Chris t: Bug s: Active` finds all active bugs assigned
    to a user named "Chris".
 
-1. Narrow your search to specific types
+4. Narrow your search to specific types
    and states, by using the drop-down selector lists at the top of the results page.
 ::: moniker-end
 
@@ -357,15 +354,14 @@ Use the following search operators to specify search criteria:
 
 The following examples show how to use operators when you create a search string.  
 
----
 |Filter for items that meet this criteria:|Type the following string:|  
-|---|---|
+|-----------------------------------------|--------------------------|
 |Assigned to Peter and not Active.|`A:Peter -S=Active`|
 |In which the Activity field was not `Development`.|`- Activity=Development`|
 |Resolved by Peter.|`"Resolved By":Peter`|
 |Contain the keyword `triage` in the title or description, are not assigned to you, and are not closed.|`triage -A=@me -S=Closed`|
 |Active bugs that are assigned to you that do not contain the keyword `bugbash` in the title.|`S=Active T=bug A=@Me -Title:bugbash`
----
+
 
 ## Related articles
 

docs/boards/queries/using-queries.md

@@ -52,7 +52,7 @@ In addition to the query filters, you can [interactively apply filters to query
 
 ::: moniker range=">= azure-devops-2019"
 > [!NOTE] 
-> Managed queries don't support proximity searches, however semantic searches do. In addition, semantic searches supports both `*` and `?` as wildcard characters and you can use more than one wildcard character to match more than one character. To learn more, see [Advanced work items search](../../project/search/advanced-work-item-search-syntax.md).
+> Managed queries don't support proximity searches, however semantic searches do. In addition, semantic searches supports both `*` and `?` as wildcard characters and you can use more than one wildcard character to match more than one character. To learn more, see [Functional work item search](../../project/search/functional-work-item-search.md).
 ::: moniker-end
 
 ---

docs/boards/work-items/about-work-items.md

@@ -219,7 +219,7 @@ You can use the search box to perform an ad hoc search to find specific work ite
 To learn more, see these topics: 
 - [About managed queries](../queries/about-managed-queries.md) 
 - [View, run, or email a query](../queries/view-run-query.md)  
-- [About managed queries, Ad hoc versus managed queries](../queries/about-managed-queries.md#ad-hoc-v-managed)  
+- [About managed queries](../queries/about-managed-queries.md) 
 - [Work item query charts](../../report/dashboards/charts.md)  
 
 <a id="templates" />

docs/docfx.json

@@ -8,7 +8,7 @@
         ],
         "exclude": [
           "pipelines/archive/apps/aspnet/aspnet-4-ci-cd-azure-automatic.md",
-          "pipelines/migrate/build-deployment-best-practices.md",
+          "migrate/build-deployment-best-practices.md",
           "pipelines/archive/apps/aspnet/**",
           "pipelines/archive/apps/java/**",
           "pipelines/archive/apps/nodejs/**",
@@ -27,8 +27,7 @@
       {
         "files": [
           "pipelines/archive/apps/aspnet/aspnet-4-ci-cd-azure-automatic.md",
-          "pipelines/migrate/build-deployment-best-practices.md",
-          "pipelines/",
+          "migrate/build-deployment-best-practices.md",
           "pipelines/archive/apps/aspnet/**",
           "pipelines/archive/apps/java/**",
           "pipelines/archive/apps/nodejs/**",

docs/get-started/index.yml

@@ -85,7 +85,7 @@ landingContent:
           - text: Authenticate with SSH
             url: ../repos/git/use-ssh-keys-to-authenticate.md
           - text: Search code across projects
-            url: ../project/search/code-search.md
+            url: ../project/search/functional-code-search.md
   - title: Build and deploy your apps
     linkLists:
       - linkListType: quickstart