Skip to content

Commit d35ca3e

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into ghissue13485
2 parents 4d0bd1d + e954dcc commit d35ca3e

File tree

214 files changed

+5302
-3096
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+5302
-3096
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27329,6 +27329,11 @@
2732927329
"source_path": "articles/virtual-machines/linux/ansible-create-complete-vm.md",
2733027330
"redirect_url": "/azure/virtual-machines/linux/ansible-create-vm",
2733127331
"redirect_document_id": true
27332+
},
27333+
{
27334+
"source_path": "articles/security-center/security-center-disk-encryption.md",
27335+
"redirect_url": "/azure/security/azure-security-disk-encryption-overview",
27336+
"redirect_document_id": false
2733227337
}
2733327338
]
2733427339
}

articles/active-directory/b2b/google-federation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ You can delete your Google federation setup. If you do so, Google guest users wh
108108
`Remove-AzureADMSIdentityProvider -Id Google-OAUTH`
109109

110110
> [!NOTE]
111-
> For more information about the Remove-AzureADMSIdentityProvider command, read the documentation here.
111+
> For more information, see [Remove-AzureADMSIdentityProvider](https://docs.microsoft.com/en-us/powershell/module/azuread/Remove-AzureADMSIdentityProvider?view=azureadps-2.0-preview).

articles/active-directory/index.experimental.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ Azure Active Directory (Azure AD) is a multi-tenant, cloud-based directory and i
113113
<h3>Devices</h3>
114114
<p>
115115
<a href="/azure/active-directory/device-management-introduction">Device management</a><br/>
116-
<a href="/azure/active-directory/device-management-azuread-registered-devices-windows10-setup">Windows 10 devices</a><br/>
117-
<a href="/azure/active-directory/device-management-azuread-joined-devices-setup">Joined devices</a>
116+
<a href="/azure/active-directory/user-help/device-management-azuread-registered-devices-windows10-setup">Windows 10 devices</a><br/>
117+
<a href="/azure/active-directory/user-help/device-management-azuread-joined-devices-setup">Joined devices</a>
118118
</p>
119119
</div>
120120
</div>

articles/active-directory/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ Azure Active Directory (Azure AD) is a multi-tenant, cloud-based directory and i
114114
<h3>Devices</h3>
115115
<p>
116116
<a href="/azure/active-directory/device-management-introduction">Device management</a><br/>
117-
<a href="/azure/active-directory/device-management-azuread-registered-devices-windows10-setup">Windows 10 devices</a><br/>
118-
<a href="/azure/active-directory/device-management-azuread-joined-devices-setup">Joined devices</a>
117+
<a href="/azure/active-directory/user-help/device-management-azuread-registered-devices-windows10-setup">Windows 10 devices</a><br/>
118+
<a href="/azure/active-directory/user-help/device-management-azuread-joined-devices-setup">Joined devices</a>
119119
</p>
120120
</div>
121121
</div>

articles/active-directory/managed-service-identity/how-to-manage-ua-identity-rest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ In this article, you learn how to create, list, and delete a user assigned manag
2929
- If you're unfamiliar with Managed Service Identity, check out the [overview section](overview.md). **Be sure to review the [difference between a system assigned and user assigned identity](overview.md#how-does-it-work)**.
3030
- If you don't already have an Azure account, [sign up for a free account](https://azure.microsoft.com/free/) before continuing.
3131
- If you are using Windows, install the [Windows Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about) or use the [Azure Cloud Shell](../../cloud-shell/overview.md) in the Azure portal.
32-
- If you use the [Windows Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about) or a [Linux distribution OS](/cli/azure/install-azure-cli-apt?view=azure-cli-latest), [Install the Azure CLI local console](/azure/install-azure-cli).
32+
- If you use the [Windows Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about) or a [Linux distribution OS](/cli/azure/install-azure-cli-apt?view=azure-cli-latest), [Install the Azure CLI local console](/cli/azure/install-azure-cli).
3333
- If you are using Azure CLI local console, sign in to Azure using `az login` with an account that is associated with the Azure subscription you would like to deploy or retrieve user assigned managed identity information.
3434
- To perform the management operations in this article, your account needs the following role assignments:
3535
- [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to create, read (list), update, and delete a user assigned identity.
Loading
Loading
Loading
Loading

articles/active-directory/managed-service-identity/msi-tutorial-linux-vm-access-arm.md

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,15 @@ You learn how to:
3535
3636
## Prerequisites
3737

38-
- If your are unfamiliar with Managed Service Identity, check out the [overview](overview.md) section. **Be sure to review the [differences between system and user assigned identities](overview.md#how-does-it-work)**.
39-
- If you don't already have an Azure account, [sign up for a free account](https://azure.microsoft.com/free/) before continuing.
40-
- To perform the required resource creation and role management steps in this tutorial, your account needs "Owner" permissions at the appropriate scope (your subscription or resource group). If you need assistance with role assignment, see [Use Role-Based Access Control to manage access to your Azure subscription resources](/azure/role-based-access-control/role-assignments-portal).
38+
[!INCLUDE [msi-qs-configure-prereqs](../../../includes/active-directory-msi-qs-configure-prereqs.md)]
4139

42-
If you choose to install and use the CLI locally, this quickstart requires that you are running the Azure CLI version 2.0.4 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI 2.0]( /cli/azure/install-azure-cli).
43-
44-
## Sign in to Azure
45-
46-
Sign in to the Azure portal at [https://portal.azure.com](https://portal.azure.com).
40+
[!INCLUDE [msi-tut-prereqs](../../../includes/active-directory-msi-tut-prereqs.md)]
4741

48-
## Create a Linux Virtual Machine in a new Resource Group
42+
[Sign in to Azure portal](https://portal.azure.com)
4943

50-
For this tutorial, you first create a new Linux VM. You can also opt to use an existing VM.
44+
[Create a Linux virtual machine](/azure/virtual-machines/linux/quick-create-portal)
5145

52-
1. Click **Create a resource** on the upper left-hand corner of the Azure portal.
53-
2. Select **Compute**, and then select **Ubuntu Server 16.04 LTS**.
54-
3. Enter the virtual machine information. For **Authentication type**, select **SSH public key** or **Password**. The created credentials allow you to log in to the VM.
55-
56-
![Create Linux VM](media/msi-tutorial-linux-vm-access-arm/msi-linux-vm.png)
57-
58-
4. Choose a **Subscription** for the virtual machine in the dropdown.
59-
5. To select a new **Resource Group** you would like the virtual machine to be created in, choose **Create New**. When complete, click **OK**.
60-
6. Select the size for the VM. To see more sizes, select **View all** or change the Supported disk type filter. On the settings blade, keep the defaults and click **OK**.
46+
If you choose to install and use the CLI locally, this quickstart requires that you are running the Azure CLI version 2.0.4 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI 2.0]( /cli/azure/install-azure-cli).
6147

6248
## Create a user assigned identity
6349

0 commit comments

Comments
 (0)