Skip to content

Commit 96180cb

Browse files
authored
Merge pull request #104875 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 bcebb25 + db2d377 commit 96180cb

File tree

6 files changed

+22
-6
lines changed

6 files changed

+22
-6
lines changed

articles/active-directory/governance/create-access-review.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ For more information, see [License requirements](access-reviews-overview.md#lice
4848

4949
![Create an access review - Start and end dates](./media/create-access-review/start-end-dates.png)
5050

51-
1. To make the access review recurring, change the **Frequency** setting from **One time** to **Weekly**, **Monthly**, **Quarterly** or **Annually**. Use the **Duration** slider or text box to define how many days each review of the recurring series will be open for input from reviewers. For example, the maximum duration that you can set for a monthly review is 27 days, to avoid overlapping reviews.
51+
1. To make the access review recurring, change the **Frequency** setting from **One time** to **Weekly**, **Monthly**, **Quarterly**, **Semi-annually**, or **Annually**. Use the **Duration** slider or text box to define how many days each review of the recurring series will be open for input from reviewers. For example, the maximum duration that you can set for a monthly review is 27 days, to avoid overlapping reviews.
5252

5353
1. Use the **End** setting to specify how to end the recurring access review series. The series can end in three ways: it runs continuously to start reviews indefinitely, until a specific date, or after a defined number of occurrences has been completed. You, another User administrator, or another Global administrator can stop the series after creation by changing the date in **Settings**, so that it ends on that date.
5454

articles/active-directory/governance/entitlement-management-organization.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,23 @@ Follow these steps to add an external Azure AD directory or domain as a connecte
9696

9797
![Access package - Policy - Add connected organization - Review + create tab](./media/entitlement-management-organization/organization-review-create.png)
9898

99+
## Update a connected organization
100+
101+
If the connected organization changes to a different domain, if you have a new name for that organization, or you wish to change the sponsors, you can update the connected organization.
102+
103+
**Prerequisite role:** Global administrator, User administrator, or Guest inviter
104+
105+
1. In the Azure portal, click **Azure Active Directory** and then click **Identity Governance**.
106+
107+
1. In the left menu, click **Connected organizations** and then click to open the connected organization.
108+
109+
1. On the Overview page, click **Edit** to change the organization name or description.
110+
111+
1. On the Directory + domain page, click **Update directory + domain** to change to a different directory or domain.
112+
113+
1. On the Sponsors page, click **Add internal sponsors** or **Add external sponsors** to add a user as a sponsor. To remove a sponsor, click on the sponsor and on the menu on the right, click **Delete**.
114+
115+
99116
## Delete a connected organization
100117

101118
If you no longer have a relationship with an external Azure AD directory or domain, you can delete the connected organization.

articles/cognitive-services/QnAMaker/includes/quickstart-test-tool-curl.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ You can request a minimum threshold for the answer. If the threshold is not met,
440440
```bash
441441
curl -X POST https://replace-with-your-resource-name.azurewebsites.net/qnamaker/knowledgebases/replace-with-your-knowledge-base-id/generateAnswer -H "Authorization: EndpointKey replace-with-your-endpoint-key" -H "Content-type: application/json" -d "{'question':'size', 'scoreThreshold':60.00}"
442442
```
443-
```
444443

445444
The returned JSON found the answer.
446445

@@ -476,4 +475,4 @@ You can request a minimum threshold for the answer. If the threshold is not met,
476475
"debugInfo": null,
477476
"activeLearningEnabled": true
478477
}
479-
```
478+
```

articles/cognitive-services/bing-visual-search/visual-search-sdk-node.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Use this quickstart to begin getting image insights from the Bing Visual Search
2222
* The Bing Visual Search SDK for Node.js
2323
* To set up a console application using the Bing Visual Search SDK, run the following commands:
2424
1. `npm install ms-rest-azure`
25-
2. `npm install azure-cognitiveservices-search-visualSearch`.
25+
2. `npm install azure-cognitiveservices-visualsearch`.
2626

2727

2828
[!INCLUDE [cognitive-services-bing-visual-search-signup-requirements](../../../includes/cognitive-services-bing-visual-search-signup-requirements.md)]

articles/iot-dps/quick-setup-auto-provision-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ az iot dps create --name my-sample-dps --resource-group my-sample-resource-group
5959
```
6060

6161
> [!TIP]
62-
> The example creates the provisioning service in the West US location. You can view a list of available locations by running the command `az provider show --namespace Microsoft.Devices --query "resourceTypes[?resourceType=='ProvisioningServices'].locations | [0]" --out table` or by going to the [Azure Status](https://azure.microsoft.com/status/) page and searching for "Device Provisioning Service". In commands, locations can be specified either in one word or multi-word format; for example: westus, West US, WEST US, etc. The value is not case sensitive. If you use multi-word format to specify location, enclose the value in quotes; for example, `-- location "West US"`.
62+
> The example creates the provisioning service in the West US location. You can view a list of available locations by running the command `az provider show --namespace Microsoft.Devices --query "resourceTypes[?resourceType=='ProvisioningServices'].locations | [0]" --out table` or by going to the [Azure Status](https://azure.microsoft.com/status/) page and searching for "Device Provisioning Service". In commands, locations can be specified either in one word or multi-word format; for example: westus, West US, WEST US, etc. The value is not case sensitive. If you use multi-word format to specify location, enclose the value in quotes; for example, `--location "West US"`.
6363
>
6464
6565
## Get the connection string for the IoT hub

articles/marketplace/cloud-partner-portal/virtual-machine/cpp-configure-winrm-after-vm-creation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This article explains how to configure an existing Azure-hosted virtual machine
2020

2121
## Enabling port traffic
2222

23-
The WinRM over HTTPS protocol uses port 5896, which is not enabled by default on pre-configured Windows VMs offered on the Azure Marketplace. To enable this protocol, use the following steps to add a new rule to the network security group (NSG) with the [Azure portal](https://portal.azure.com). For more information about NSGs, see [Security Groups](https://docs.microsoft.com/azure/virtual-network/security-overview).
23+
The WinRM over HTTPS protocol uses port 5986, which is not enabled by default on pre-configured Windows VMs offered on the Azure Marketplace. To enable this protocol, use the following steps to add a new rule to the network security group (NSG) with the [Azure portal](https://portal.azure.com). For more information about NSGs, see [Security Groups](https://docs.microsoft.com/azure/virtual-network/security-overview).
2424

2525
1. Navigate to the blade **Virtual machines >** <*vm-name*> **> Settings/Networking**.
2626
2. Click on the NSG name (in this example, **testvm11002**) to display its properties:

0 commit comments

Comments
 (0)