Skip to content

Commit d92abae

Browse files
authored
Merge pull request #180141 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents bdbcf03 + eda9742 commit d92abae

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

articles/active-directory/fundamentals/users-default-permissions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Users can register application | Setting this option to No prevents users from c
4949
Allow users to connect work or school account with LinkedIn | Setting this option to No prevents users from connecting their work or school account with their LinkedIn account. For more information, see [LinkedIn account connections data sharing and consent](../enterprise-users/linkedin-user-consent.md).
5050
Ability to create security groups | Setting this option to No prevents users from creating security groups. Global administrators and User administrators can still create security groups. See [Azure Active Directory cmdlets for configuring group settings](../enterprise-users/groups-settings-cmdlets.md) to learn how.
5151
Ability to create Microsoft 365 groups | Setting this option to No prevents users from creating Microsoft 365 groups. Setting this option to Some allows a select set of users to create Microsoft 365 groups. Global administrators and User administrators will still be able to create Microsoft 365 groups. See [Azure Active Directory cmdlets for configuring group settings](../enterprise-users/groups-settings-cmdlets.md) to learn how.
52-
Restrict access to Azure AD administration portal | <p>Setting this option to No lets non-administrators use the Azure AD administration portal to read and manage Azure AD resources. Yes restricts all non-administrators from accessing any Azure AD data in the administration portal.</p><p>**Note**: this setting does not restrict access to Azure AD data using PowerShell or other clients such as Visual Studio.When set to Yes, to grant a specific non-admin user the ability to use the Azure AD administration portal assign any administrative role such as the Directory Readers role.</p><p>**Note**: this settings will block non-admin users who are owners of groups or applications from using the Azure portal to manage their owned resources.</p><p>This role allows reading basic directory information, which member users have by default (guests and service principals do not).</p>
52+
Restrict access to Azure AD administration portal | <p>Setting this option to No lets non-administrators use the Azure AD administration portal to read and manage Azure AD resources. Yes restricts all non-administrators from accessing any Azure AD data in the administration portal.</p><p>**Note**: this setting does not restrict access to Azure AD data using PowerShell or other clients such as Visual Studio.When set to Yes, to grant a specific non-admin user the ability to use the Azure AD administration portal assign any administrative role such as the Directory Readers role.</p><p>**Note**: this settings will block non-admin users who are owners of groups or applications from using the Azure portal to manage their owned resources.</p><p>This role allows reading basic directory information, which member users have by default (guests and service principals do not).</p><p>**Note**: this setting does not restrict access as long as a user is assigned a custom role or any role for that matter and is not just a user.</p>
5353
Ability to read other users | This setting is available in PowerShell only. Setting this flag to $false prevents all non-admins from reading user information from the directory. This flag does not prevent reading user information in other Microsoft services like Exchange Online. This setting is meant for special circumstances, and setting this flag to $false is not recommended.
5454

5555
>[!NOTE]

articles/active-directory/hybrid/whatis-azure-ad-connect-v2.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ We expect TLS 1.0/1.1 to be deprecated in January 2022, and you need to make sur
9898
In June 2022, ADAL will go out of support. When ADAL goes out of support authentication may stop working unexpectedly and this will block the Azure AD Connect server from working properly. We strongly advise you to upgrade to Azure AD Connect V2.0 before June 2022. You cannot upgrade to a supported authentication library with your current Azure AD Connect version.
9999

100100
**After upgrading to 2.0 the ADSync PowerShell cmdlets do not work?** </br>
101-
This is a known issue. To resolve this, restart your PowerShell session after installing or upgrading to version 2.0 and then re-import the module. Use the following instructions to import the module.
101+
This is a known issue. To resolve this, restart your PowerShell session after installing or upgrading to version 2.0 and then re-import the module. Use the following instructions to import the module.
102102

103-
1. Open Windows PowerShell with administrative privileges
104-
2. Type or copy and paste the following:
105-
``` powershell
106-
Import-module -Name "C:\Program Files\Microsoft Azure AD Sync\Bin\ADSync"
107-
```
103+
1. Open Windows PowerShell with administrative privileges.
104+
1. Type or copy and paste the following code:
108105

106+
```powershell
107+
Import-module -Name "C:\Program Files\Microsoft Azure AD Sync\Bin\ADSync"
108+
```
109109
110110
## License requirements for using Azure AD Connect V2.0
111111

articles/azure-app-configuration/quickstart-resource-manager.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ If your environment meets the prerequisites and you're familiar with using ARM t
2828

2929
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
3030

31+
## Authorization
32+
33+
Accessing key-value data inside an ARM template requires an Azure Resource Manager role, such as contributor or owner. Access via one of the Azure App Configuration [data plane roles](concept-enable-rbac.md) currently is not supported.
34+
35+
> [!NOTE]
36+
> Key-value data access inside an ARM template is disabled if access key authentication is disabled. For more information, see [disable access key authentication](./howto-disable-access-key-authentication.md#limitations).
37+
3138
## Review the template
3239

3340
The template used in this quickstart is from [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/app-configuration-store-kv/). It creates a new App Configuration store with two key-values inside. It then uses the `reference` function to output the values of the two key-value resources. Reading the key's value in this way allows it to be used in other places in the template.
@@ -62,9 +69,6 @@ Two Azure resources are defined in the template:
6269
> az appconfig update -g MyResourceGroup -n MyAppConfiguration --enable-public-network true
6370
> ```
6471
65-
> [!NOTE]
66-
> There is a limitation where key-value data access inside an ARM template is disabled if access key authentication is disabled. See [disable access key authentication](./howto-disable-access-key-authentication.md#limitations) for more details.
67-
6872
## Deploy the template
6973
7074
Select the following image to sign in to Azure and open a template. The template creates an App Configuration store with two key-values inside.

articles/cognitive-services/Speech-Service/speech-synthesis-markup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ Pitch changes can be applied to standard voices at the word or sentence-level. W
752752
**Syntax**
753753

754754
```xml
755-
<say-as interpret-as="string" format="digit string" detail="string"> <say-as>
755+
<say-as interpret-as="string" format="digit string" detail="string"> </say-as>
756756
```
757757

758758
**Attributes**

0 commit comments

Comments
 (0)