Skip to content

Commit c8b1ab2

Browse files
authored
Merge pull request #96787 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 85cd855 + 39b7134 commit c8b1ab2

File tree

9 files changed

+27
-18
lines changed

9 files changed

+27
-18
lines changed

articles/active-directory/conditional-access/howto-conditional-access-policy-registration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The following policy applies to all selected users, who attempt to register usin
4242
1. Click **Block access**.
4343
1. Then click **Select**.
4444
1. Set **Enable policy** to **On**.
45-
1. Then click **Create**.
45+
1. Then click **Save**.
4646

4747
## Next steps
4848

articles/active-directory/devices/hybrid-azuread-join-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Hybrid Azure AD join is supported for FIPS-compliant TPM 2.0 and not supported f
7878

7979
Hybrid Azure AD join is not supported for Windows Server running the Domain Controller (DC) role.
8080

81-
Hybrid Azure AD join is not supported on Windows down-level devices when using credential roaming or user profile roaming.
81+
Hybrid Azure AD join is not supported on Windows down-level devices when using credential roaming or user profile roaming or mandatory profile.
8282

8383
If you are relying on the System Preparation Tool (Sysprep) and if you are using a **pre-Windows 10 1809** image for installation, make sure that image is not from a device that is already registered with Azure AD as Hybrid Azure AD join.
8484

articles/analysis-services/analysis-services-create-sample-model.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ These steps describe how to delete a model from a server by using SSMS.
6868
In this tutorial, you learned how to add a basic, sample model to your server. Now that you have a model database, you can connect to it from SQL Server Management Studio and add user roles. To learn more, continue with the next tutorial.
6969

7070
> [!div class="nextstepaction"]
71-
> [Tutorial: Configure server administrator and user roles](analysis-services-database-users.md)
71+
> [Tutorial: Configure server administrator and user roles](tutorials/analysis-services-tutorial-roles.md)
7272
7373

articles/azure-maps/supported-map-styles.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ This map style is a hybrid of roads and labels overlaid on top of satellite and
5959
![gray_scale](./media/supported-map-styles/grayscale_dark.png)
6060

6161
**Applicable APIs:**
62+
* [Map image](https://docs.microsoft.com/rest/api/maps/render/getmapimage)
63+
* [Map tile](https://docs.microsoft.com/rest/api/maps/render/getmaptile)
6264
* Web SDK map control
6365
* Android map control
6466

@@ -98,4 +100,4 @@ This map style is a hybrid of roads and labels overlaid on top of satellite and
98100
Learn about how to set a map style in Azure Maps:
99101

100102
> [!div class="nextstepaction"]
101-
> [Choose a map style](https://docs.microsoft.com/azure/azure-maps/choose-map-style)
103+
> [Choose a map style](https://docs.microsoft.com/azure/azure-maps/choose-map-style)

articles/cognitive-services/QnAMaker/whats-new.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: qna-maker
1010
ms.topic: overview
11-
ms.date: 10/14/2019
11+
ms.date: 11/08/2019
1212
ms.author: diberry
1313
---
1414

@@ -20,6 +20,12 @@ Learn what's new in the service. These items may release notes, videos, blog pos
2020

2121
Learn what's new with QnA Maker.
2222

23+
### November 2019
24+
25+
* [US Government cloud support](https://docs.microsoft.com/azure/azure-government/documentation-government-services-aiandcognitiveservices#qna-maker) for QnA Maker
26+
* [Multi-turn](https://docs.microsoft.com/azure/cognitive-services/qnamaker/how-to/multiturn-conversation) feature in GA
27+
* [Chit-chat support](https://docs.microsoft.com/azure/cognitive-services/qnamaker/how-to/chit-chat-knowledge-base#language-support) available in tier-1 languages
28+
2329
### October 2019
2430

2531
* [Explicitly setting the language](./how-to/language-knowledge-base.md#select-language-when-creating-first-knowledge-base) for all knowledge bases in the QnA Maker service.
@@ -47,4 +53,4 @@ Learn what's new with QnA Maker.
4753
4854
## Cognitive Service updates
4955

50-
[Azure update announcements for Cognitive Services](https://azure.microsoft.com/updates/?product=cognitive-services)
56+
[Azure update announcements for Cognitive Services](https://azure.microsoft.com/updates/?product=cognitive-services)

articles/cognitive-services/text-analytics/how-tos/text-analytics-how-to-entity-linking.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ Entity linking
116116
| DateTime | Set | "every Tuesday" |
117117
| URL | N/A\* | "https:\//www.bing.com" |
118118
| Email | N/A\* | "[email protected]" |
119+
| US Phone Number | N/A\* | (US phone numbers only) "(312) 555-0176" |
120+
| IP Address | N/A\* | "10.0.0.100" |
119121

120122
\* Depending on the input and extracted entities, certain entities may omit the `SubType`. All the supported entity types listed are available only for the English, Chinese-Simplified, French, German, and Spanish languages.
121123

articles/data-factory/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### YamlMime:Landing
22

33
title: Azure Data Factory documentation
4-
summary: Azure Data Factory is Azure's cloud ETL service for scale-out serverless data integration and data transformation. It offers a code-free UI for intuitive authoring and single-pane-of-class monitoring and management. You can also lift and shift existing SSIS packages to Azure and run them with full compatibility in ADF. SSIS Integration Runtime offers a fully managed service, so you don't have to worry about infrastructure management.
4+
summary: Azure Data Factory is Azure's cloud ETL service for scale-out serverless data integration and data transformation. It offers a code-free UI for intuitive authoring and single-pane-of-glass monitoring and management. You can also lift and shift existing SSIS packages to Azure and run them with full compatibility in ADF. SSIS Integration Runtime offers a fully managed service, so you don't have to worry about infrastructure management.
55
metadata:
66
title: Azure Data Factory Documentation
77
description: Learn how to use Data Factory, a cloud data integration service, to compose data storage, movement, and processing services into automated data pipelines. Tutorials and other documentation show you how to set up and manage data pipelines, and how to move and transform data for analysis.

articles/search/search-filters.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ At query time, a filter parser accepts criteria as input, converts the expressio
5656
Filtering occurs in tandem with search, qualifying which documents to include in downstream processing for document retrieval and relevance scoring. When paired with a search string, the filter effectively reduces the recall set of the subsequent search operation. When used alone (for example, when the query string is empty where `search=*`), the filter criteria is the sole input.
5757

5858
## Defining filters
59-
6059
Filters are OData expressions, articulated using a [subset of OData V4 syntax supported in Azure Cognitive Search](https://docs.microsoft.com/rest/api/searchservice/odata-expression-syntax-for-azure-search).
6160

6261
You can specify one filter for each **search** operation, but the filter itself can include multiple fields, multiple criteria, and if you use an **ismatch** function, multiple full-text search expressions. In a multi-part filter expression, you can specify predicates in any order (subject to the rules of operator precedence). There is no appreciable gain in performance if you try to rearrange predicates in a particular sequence.
@@ -67,23 +66,23 @@ The following examples represent prototypical filter definitions in several APIs
6766

6867
```http
6968
# Option 1: Use $filter for GET
70-
GET https://[service name].search.windows.net/indexes/hotels/docs?search=*&$filter=baseRate lt 150&$select=hotelId,description&api-version=2019-05-06
69+
GET https://[service name].search.windows.net/indexes/hotels/docs?api-version=2019-05-06&search=*&$filter=Rooms/any(room: room/BaseRate lt 150.0)&$select=HotelId, HotelName, Rooms/Description, Rooms/BaseRate
7170
7271
# Option 2: Use filter for POST and pass it in the request body
7372
POST https://[service name].search.windows.net/indexes/hotels/docs/search?api-version=2019-05-06
7473
{
7574
"search": "*",
76-
"filter": "baseRate lt 150",
77-
"select": "hotelId,description"
75+
"filter": "Rooms/any(room: room/BaseRate lt 150.0)",
76+
"select": "HotelId, HotelName, Rooms/Description, Rooms/BaseRate"
7877
}
7978
```
8079

8180
```csharp
8281
parameters =
8382
new SearchParameters()
8483
{
85-
Filter = "baseRate lt 150",
86-
Select = new[] { "hotelId", "description" }
84+
Filter = "Rooms/BaseRate lt 150.0",
85+
Select = new[] { "HotelId", "HotelName", "Rooms/Description" ,"Rooms/BaseRate"}
8786
};
8887

8988
var results = searchIndexClient.Documents.Search("*", parameters);
@@ -96,13 +95,13 @@ The following examples illustrate several usage patterns for filter scenarios. F
9695
+ Standalone **$filter**, without a query string, useful when the filter expression is able to fully qualify documents of interest. Without a query string, there is no lexical or linguistic analysis, no scoring, and no ranking. Notice the search string is just an asterisk, which means "match all documents".
9796

9897
```
99-
search=*&$filter=(baseRate ge 60 and baseRate lt 300) and accommodation eq 'Hotel' and city eq 'Nogales'
98+
search=*&$filter=Rooms/any(room: room/BaseRate ge 60 and room/BaseRate lt 300) and Address/City eq 'Honolulu'
10099
```
101100

102101
+ Combination of query string and **$filter**, where the filter creates the subset, and the query string provides the term inputs for full text search over the filtered subset. Using a filter with a query string is the most common usage pattern.
103102

104103
```
105-
search=hotels ocean$filter=(baseRate ge 60 and baseRate lt 300) and city eq 'Los Angeles'
104+
search=walking distance theaters&$filter=Rooms/any(room: room/BaseRate ge 60 and room/BaseRate lt 300) and Address/City eq 'Seattle'&$count=true
106105
```
107106

108107
+ Compound queries, separated by "or", each with its own filter criteria (for example, 'beagles' in 'dog' or 'siamese' in 'cat'). Expressions combined with `or` are evaluated individually, with the union of documents matching each expression sent back in the response. This usage pattern is achieved through the `search.ismatchscoring` function. You can also use the non-scoring version, `search.ismatch`.
@@ -118,9 +117,9 @@ The following examples illustrate several usage patterns for filter scenarios. F
118117
It is also possible to combine full-text search via `search.ismatchscoring` with filters using `and` instead of `or`, but this is functionally equivalent to using the `search` and `$filter` parameters in a search request. For example, the following two queries produce the same result:
119118

120119
```
121-
$filter=search.ismatchscoring('pool') and rating ge 4
120+
$filter=search.ismatchscoring('pool') and Rating ge 4
122121
123-
search=pool&$filter=rating ge 4
122+
search=pool&$filter=Rating ge 4
124123
```
125124

126125
Follow up with these articles for comprehensive guidance on specific use cases:

articles/virtual-machines/scripts/virtual-machines-windows-powershell-sample-copy-snapshot-to-same-or-different-subscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ This script uses following commands to create a snapshot in the target subscript
4343
| Command | Notes |
4444
|---|---|
4545
| [New-AzSnapshotConfig](https://docs.microsoft.com/powershell/module/az.compute/New-AzSnapshotConfig) | Creates snapshot configuration that is used for snapshot creation. It includes the resource Id of the parent snapshot and location that is same as the parent snapshot. |
46-
| [New-AzSnapshot](https://docs.microsoft.com/powershell/module/az.compute/New-AzDisk) | Creates a snapshot using snapshot configuration, snapshot name, and resource group name passed as parameters. |
46+
| [New-AzSnapshot](https://docs.microsoft.com/powershell/module/az.compute/new-azsnapshot) | Creates a snapshot using snapshot configuration, snapshot name, and resource group name passed as parameters. |
4747

4848
## Next steps
4949

0 commit comments

Comments
 (0)