Skip to content

Commit f616c8b

Browse files
authored
Merge pull request #97876 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 44c7a75 + 2f2f620 commit f616c8b

File tree

6 files changed

+44
-12
lines changed

6 files changed

+44
-12
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
12
# Microsoft Azure Documentation
23

34
Welcome to the open-source [documentation](https://docs.microsoft.com/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
45

56
## Getting Started
67

7-
Contributing to open source is more than just providing updates, it's also letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
8+
Contributing to open source is more than just providing updates, it's also about letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
89

910
### Prerequisites
1011

articles/azure-arc/servers/quickstart-onboard-powershell.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,13 @@ Id : 5be92c87-01c4-42f5-bade-c1c10af87758
4949
Type :
5050
```
5151

52-
Now, retrieve the password using powershell.
52+
> [!NOTE]
53+
> It may take a while to get your SPN permissions properly populated. Running the following role assignment to set the permissions much faster.
54+
> ``` PowerShell
55+
> New-AzRoleAssignment -RoleDefinitionName "Azure Connected Machine Onboarding" -ServicePrincipalName $sp.ApplicationId
56+
> ```
57+
58+
Now, retrieve the password using PowerShell.
5359
5460
```azurepowershell-interactive
5561
$credential = New-Object pscredential -ArgumentList "temp", $sp.Secret

articles/cognitive-services/Speech-Service/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Azure customers can create and manage support requests in the Azure portal.
5858

5959
Stack Overflow is the preferred channel for development-related questions. It's where members of the community and Microsoft team members are directly involved in helping you solve your problems.
6060

61-
If you can't find an answer to your problem via search, submit a new question to Stack Overflow by using the [microsoft-cognitive-speech](https://stackoverflow.com/questions/tagged/microsoft-cognitive-speech) tag.
61+
If you can't find an answer to your problem via search, submit a new question to Stack Overflow by using the [microsoft-cognitive+speech](https://stackoverflow.com/questions/tagged/microsoft-cognitive+speech) tag.
6262

6363
> [!TIP]
6464
> The following posts from Stack Overflow contain tips on how to form questions and add source code. Following these guidelines might help increase the chances that community members assess and respond to your question quickly:

articles/role-based-access-control/resource-provider-operations.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1810,7 +1810,6 @@ The resource provider operations are always evolving. To get the latest operatio
18101810
> | Action Type | Operation | Description |
18111811
> | --- | --- | --- |
18121812
> | Action | Microsoft.DataBoxEdge/dataBoxEdgeDevices/alerts/read | Lists or gets the alerts |
1813-
> | Action | Microsoft.DataBoxEdge/dataBoxEdgeDevices/alerts/read | Lists or gets the alerts |
18141813
> | Action | Microsoft.DataBoxEdge/dataBoxEdgeDevices/bandwidthSchedules/delete | Deletes the bandwidth schedules |
18151814
> | Action | Microsoft.DataBoxEdge/dataBoxEdgeDevices/bandwidthSchedules/operationResults/read | Lists or gets the operation result |
18161815
> | Action | Microsoft.DataBoxEdge/dataBoxEdgeDevices/bandwidthSchedules/read | Lists or gets the bandwidth schedules |

articles/search/search-more-like-this.md

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,50 @@ ms.date: 11/04/2019
2222

2323
By default, the contents of all top-level searchable fields are considered. If you want to specify particular fields instead, you can use the `searchFields` parameter.
2424

25-
You cannot use moreLikeThis on searchable sub-fields in a [complex type](search-howto-complex-data-types.md).
25+
You cannot use `MoreLikeThis` on searchable sub-fields in a [complex type](search-howto-complex-data-types.md).
2626

27-
## Examples
27+
## Examples
2828

29-
Below is an example of a moreLikeThis query. The query finds documents whose description fields are most similar to the field of the source document as specified by the `moreLikeThis` parameter.
29+
All following examples use the hotels sample from [Quickstart: Create a search index in the Azure portal](search-get-started-portal.md).
30+
31+
### Simple query
32+
33+
The following query finds documents whose description fields are most similar to the field of the source document as specified by the `moreLikeThis` parameter:
3034

3135
```
32-
Get /indexes/hotels/docs?moreLikeThis=1002&searchFields=description&api-version=2019-05-06-Preview
36+
GET /indexes/hotels-sample-index/docs?moreLikeThis=29&searchFields=Description&api-version=2019-05-06-Preview
3337
```
3438

39+
In this example, the request searches for hotels similar to the one with `HotelId` 29.
40+
Rather than using HTTP GET, you can also invoke `MoreLikeThis` using HTTP POST:
41+
3542
```
36-
POST /indexes/hotels/docs/search?api-version=2019-05-06-Preview
43+
POST /indexes/hotels-sample-index/docs/search?api-version=2019-05-06-Preview
3744
{
38-
"moreLikeThis": "1002",
39-
"searchFields": "description"
45+
"moreLikeThis": "29",
46+
"searchFields": "Description"
4047
}
4148
```
4249

50+
### Apply filters
51+
52+
`MoreLikeThis` can be combined with other common query parameters like `$filter`. For instance, the query can be restricted to only hotels whose category is 'Budget' and where the rating is higher than 3.5:
53+
54+
```
55+
GET /indexes/hotels-sample-index/docs?moreLikeThis=20&searchFields=Description&$filter=(Category eq 'Budget' and Rating gt 3.5)&api-version=2019-05-06-Preview
56+
```
57+
58+
### Select fields and limit results
59+
60+
The `$top` selector can be used to limit how many results should be returned in a `MoreLikeThis` query. Also, fields can be selected with `$select`. Here the top three hotels are selected along with their ID, Name, and Rating:
61+
62+
```
63+
GET /indexes/hotels-sample-index/docs?moreLikeThis=20&searchFields=Description&$filter=(Category eq 'Budget' and Rating gt 3.5)&$top=3&$select=HotelId,HotelName,Rating&api-version=2019-05-06-Preview
64+
```
4365

4466
## Next steps
4567

4668
You can use any web testing tool to experiment with this feature. We recommend using Postman for this exercise.
4769

4870
> [!div class="nextstepaction"]
49-
> [Explore Azure Cognitive Search REST APIs using Postman](search-get-started-postman.md)
71+
> [Explore Azure Cognitive Search REST APIs using Postman](search-get-started-postman.md)

includes/bastion-faq-include.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,7 @@ Azure Bastion currently supports en-us-qwerty keyboard layout inside the VM. Su
5555

5656
No. UDR is not supported on an Azure Bastion subnet.
5757
For scenarios that include both Azure Bastion and Azure Firewall/Network Virtual Appliance (NVA) in the same virtual network, you don’t need to force traffic from an Azure Bastion subnet to Azure Firewall because the communication between Azure Bastion and your VMs is private. For more details, see [Accessing VMs behind Azure Firewall with Bastion](https://azure.microsoft.com/blog/accessing-virtual-machines-behind-azure-firewall-with-azure-bastion/).
58+
59+
### <a name="filetransfer"></a>Is file-transfer supported with Azure Bastion RDP session?
60+
61+
We are working hard to add new features. As of now, file transfer is not supported but is part of our roadmap. Please feel free to share your feedback about new features on the [Azure Bastion Feedback page](https://feedback.azure.com/forums/217313-networking?category_id=367303).

0 commit comments

Comments
 (0)