Skip to content

Commit 3ace82f

Browse files
authored
Merge pull request #79689 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 4351e9e + b587c84 commit 3ace82f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

articles/automation/tutorial-configure-servers-desired-state.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ or the Az cmdlets.
165165
> so the node is no longer connecting to the service.
166166
> This does not effect the configuration that is currently applied to the node.
167167
> To remove the current configuration, use the
168-
> [PowerShell](https://docs.microsoft.com/en-us/powershell/module/psdesiredstateconfiguration/remove-dscconfigurationdocument?view=powershell-5.1)
168+
> [PowerShell](https://docs.microsoft.com/powershell/module/psdesiredstateconfiguration/remove-dscconfigurationdocument?view=powershell-5.1)
169169
> or delete the local configuration file
170170
> (this is the only option for Linux nodes).
171171
@@ -180,7 +180,7 @@ In the Node view that opens, click **Unregister**.
180180

181181
To unregister a node from Azure Automation State Configuration service using PowerShell,
182182
follow the documentation for the cmdlet
183-
[Unregister-AzAutomationDscNode](https://docs.microsoft.com/en-us/powershell/module/az.automation/unregister-azautomationdscnode?view=azps-2.0.0).
183+
[Unregister-AzAutomationDscNode](https://docs.microsoft.com/powershell/module/az.automation/unregister-azautomationdscnode?view=azps-2.0.0).
184184

185185
## Next steps
186186

articles/container-instances/container-instances-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ az container exec --resource-group myResourceGroup --name mycontainer --exec-com
150150
Run the following commands in the bash shell in the container. To get an access token to use Azure Active Directory to authenticate to Key Vault, run the following command:
151151

152152
```bash
153-
curl 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fvault.azure.net%2F' -H Metadata:true -s
153+
curl 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fvault.azure.net' -H Metadata:true -s
154154
```
155155

156156
Output:

articles/databox-online/data-box-edge-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Azure Data Box Edge is an AI-enabled edge computing device with network data tra
3131
- Analyze and react to IoT Events.
3232

3333
- **Inference Azure Machine Learning** - With Data Box Edge, you can run Machine Learning (ML) models to get quick results that can be acted on before the data is sent to the cloud. The full data set can be transferred to continue to retrain and improve your ML models. For more information on how to use the Azure ML hardware accelerated models on the Databox Edge device, see
34-
[Deploy Azure ML hardware accelerated models on Databox Edge](https://docs.microsoft.com/en-us/azure/machine-learning/service/how-to-deploy-fpga-web-service#deploy-to-a-local-edge-server).
34+
[Deploy Azure ML hardware accelerated models on Databox Edge](https://docs.microsoft.com/azure/machine-learning/service/how-to-deploy-fpga-web-service#deploy-to-a-local-edge-server).
3535

3636
- **Transfer data over network to Azure** - Use Data Box Edge to easily and quickly transfer data to Azure to enable further compute and analytics or for archival purposes.
3737

includes/active-directory-service-limits-include.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ Here are the usage constraints and other service limits for the Azure Active Dir
2323
| Access Panel |<ul><li>There's no limit to the number of applications that can be seen in the Access Panel per user. This applies to users assigned licenses for Azure AD Premium or the Enterprise Mobility Suite.</li><li>A maximum of 10 app tiles can be seen in the Access Panel for each user. This limit applies to users who are assigned licenses for Free or Azure AD Basic editions of Azure Active Directory. Examples of app tiles include Box, Salesforce, or Dropbox. This limit doesn't apply to administrator accounts.</li></ul> |
2424
| Reports | A maximum of 1,000 rows can be viewed or downloaded in any report. Any additional data is truncated. |
2525
| Administrative units | An object can be a member of no more than 30 administrative units. |
26-
| Admin roles and permissions | <ul><li>A group cannot be added as an [owner](https://docs.microsoft.com/en-us/azure/active-directory/fundamentals/users-default-permissions?context=azure/active-directory/users-groups-roles/context/ugr-context#object-ownership).</li><li>A group cannot be assigned to a [role](https://docs.microsoft.com/en-us/azure/active-directory/users-groups-roles/directory-assign-admin-roles).</li><li>Users’ ability to read other users’ directory information cannot be restricted outside of the tenant-wide switch to disable all non-admin users’ access to all directory information (not recommended). More information on default permissions [here](https://docs.microsoft.com/en-us/azure/active-directory/fundamentals/users-default-permissions?context=azure/active-directory/users-groups-roles/context/ugr-context#to-restrict-the-default-permissions-for-member-users).</li><li>It may take up to 15 minutes or signing out/signing in before admin role membership additions and revocations take effect.</li></ul> |
26+
| Admin roles and permissions | <ul><li>A group cannot be added as an [owner](https://docs.microsoft.com/azure/active-directory/fundamentals/users-default-permissions?context=azure/active-directory/users-groups-roles/context/ugr-context#object-ownership).</li><li>A group cannot be assigned to a [role](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-assign-admin-roles).</li><li>Users’ ability to read other users’ directory information cannot be restricted outside of the tenant-wide switch to disable all non-admin users’ access to all directory information (not recommended). More information on default permissions [here](https://docs.microsoft.com/azure/active-directory/fundamentals/users-default-permissions?context=azure/active-directory/users-groups-roles/context/ugr-context#to-restrict-the-default-permissions-for-member-users).</li><li>It may take up to 15 minutes or signing out/signing in before admin role membership additions and revocations take effect.</li></ul> |

0 commit comments

Comments
 (0)