Skip to content

Commit d128802

Browse files
Merge pull request #103758 from MicrosoftDocs/master
Merge master to live, 4 AM
2 parents 323c3f2 + 6788bee commit d128802

17 files changed

+157
-209
lines changed

articles/active-directory-b2c/custom-policy-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ You need to register these two applications in your Azure AD B2C tenant only onc
6969

7070
### Register the IdentityExperienceFramework application
7171

72-
To register an application in your Azure AD B2C tenant, you can use the current **Applications** experience, or our new unified **App registrations (Preview)** experience. [Learn more about the new experience](https://aka.ms/b2cappregintro).
72+
To register an application in your Azure AD B2C tenant, you can use the **App registrations (Legacy)** experience, or our new unified **App registrations (Preview)** experience. [Learn more about the new experience](https://aka.ms/b2cappregintro).
7373

7474
#### [Applications](#tab/applications/)
7575

articles/active-directory-b2c/one-time-password-technical-profile.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 02/03/2020
12+
ms.date: 02/10/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -164,3 +164,10 @@ The following example `TechnicalProfile` is used for verifying a code:
164164
</InputClaims>
165165
</TechnicalProfile>
166166
```
167+
168+
## Next steps
169+
170+
See the following article for example of using one-time password technial profile with custom email verification:
171+
172+
- [Custom email verification in Azure Active Directory B2C](custom-email.md)
173+

articles/aks/control-kubeconfig-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ AKS_CLUSTER=$(az aks show --resource-group myResourceGroup --name myAKSCluster -
6060
6161
# Get the account credentials for the logged in user
6262
ACCOUNT_UPN=$(az account show --query user.name -o tsv)
63-
ACCOUNT_ID=$(az ad user show --upn-or-object-id $ACCOUNT_UPN --query objectId -o tsv)
63+
ACCOUNT_ID=$(az ad user show --id $ACCOUNT_UPN --query objectId -o tsv)
6464
6565
# Assign the 'Cluster Admin' role to the user
6666
az role assignment create \

articles/azure-arc/servers/overview.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.subservice: azure-arc-servers
77
author: mgoedtel
88
ms.author: magoedte
99
keywords: azure automation, DSC, powershell, desired state configuration, update management, change tracking, inventory, runbooks, python, graphical, hybrid
10-
ms.date: 01/29/2020
10+
ms.date: 02/03/2020
1111
ms.custom: mvc
1212
ms.topic: overview
1313
---
@@ -50,6 +50,12 @@ The following versions of the Windows and Linux operating system are officially
5050
>This preview release of the Connected Machine agent for Windows only supports Windows Server configured to use the English language.
5151
>
5252
53+
### Required permissions
54+
55+
- To onboard machines, you are a member of the **Azure Connected Machine Onboarding** role.
56+
57+
- To read, modify, re-onboard, and delete a machine, you are a member of the **Azure Connected Machine Resource Administrator** role.
58+
5359
### Azure subscription and service limits
5460

5561
Before configuring your machines with Azure Arc for servers (preview), you should review the Azure Resource Manager [subscription limits](../../azure-resource-manager/management/azure-subscription-service-limits.md#subscription-limits---azure-resource-manager) and [resource group limits](../../azure-resource-manager/management/azure-subscription-service-limits.md#resource-group-limits) to plan for the number of machines to be connected.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: azure-arc
66
ms.subservice: azure-arc-servers
77
author: mgoedtel
88
ms.author: magoedte
9-
ms.date: 01/29/2020
9+
ms.date: 02/09/2020
1010
ms.custom: mvc
1111
ms.topic: quickstart
1212
---
@@ -183,5 +183,6 @@ To disconnect a machine from Azure Arc for servers (preview), do the following:
183183
184184
## Next steps
185185
186-
> [!div class="nextstepaction"]
187-
> [Assign a policy to connected machines](../../governance/policy/assign-policy-portal.md)
186+
- Learn how to manage your machine using [Azure Policy](../../governance/policy/overview.md), for such things as VM [guest configuration](../../governance/policy/concepts/guest-configuration.md), verifying the machine is reporting to the expected Log Analytics workspace, enable monitoring with [Azure Monitor with VMs](../../azure-monitor/insights/vminsights-enable-at-scale-policy.md), and much more.
187+
188+
- Learn more about the [Log Analytics agent](../../azure-monitor/platform/log-analytics-agent.md). The Log Analytics agent for Windows and Linux is required when you want to proactively monitor the OS and workloads running on the machine, manage it using Automation runbooks or solutions like Update Management, or use other Azure services like [Azure Security Center](../../security-center/security-center-intro.md).

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

Lines changed: 81 additions & 178 deletions
Large diffs are not rendered by default.

articles/azure-functions/functions-networking-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ To provide a higher level of security, you can restrict a number of Azure servic
106106

107107
### Restricting your storage account to a virtual network
108108

109-
When you create a function app, you must create or link to a general-purpose Azure Storage account that supports Blob, Queue, and Table storage. You can't currently use any virtual network restrictions on this account. If you configure a virtual network service endpoint on the storage account you're using for your function app, that will break your app.
109+
When you create a function app, you must create or link to a general-purpose Azure Storage account that supports Blob, Queue, and Table storage. You can't currently use any virtual network restrictions on this account. If you configure a virtual network service endpoint on the storage account you're using for your function app, that will break your app.This functionality is currently available using the Premium Plan and a virtual network integration.
110110

111111
[Learn more about storage account requirements.](./functions-create-function-app-portal.md#storage-account-requirements)
112112

articles/backup/backup-azure-restore-files-from-vm.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ To restore files or folders from the recovery point, go to the virtual machine a
5151

5252
![File recovery menu](./media/backup-azure-restore-files-from-vm/executable-output.png)
5353

54+
8. For Linux machines, a python script is generated. One needs to download the script and copy it to the relevant/compatible Linux server. You may have to modify the permissions to execute it with ```chmod +x <python file name>```. Then run the python file with ```./<python file name>```.
55+
5456
Refer to the [Access requirements](#access-requirements) section to make sure the script is run successfully.
5557

5658
### Identifying volumes

articles/backup/tutorial-restore-disk.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ To see a list of available recovery points, use [az backup recoverypoint list](h
4444
az backup recoverypoint list \
4545
--resource-group myResourceGroup \
4646
--vault-name myRecoveryServicesVault \
47+
--backup-management-type AzureIaasVM
4748
--container-name myVM \
4849
--item-name myVM \
4950
--query [0].name \

articles/cost-management-billing/manage/spending-limit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ To remove your spending limit, follow these steps:
5454

5555
The spending limit could prevent you from deploying or using certain third-party and Microsoft services. Here are the situations where you should remove the spending limit on your subscription.
5656

57-
- You plan to deploy first party images like Oracle or services such as Azure DevOps Services. This situation causes you to reach your spending limit almost immediately and causes your subscription to be disabled.
57+
- You plan to deploy third-party images like Oracle or services such as Azure DevOps Services. This situation causes you to reach your spending limit almost immediately and causes your subscription to be disabled.
5858
- You have services that you don't want disrupted. When you reach your spending limit, Azure resources that you deployed are removed from production and your Azure virtual machines are stopped and de-allocated. If you have services that you don't want disrupted, you must remove your spending limit.
5959
- You have services and resources with settings like virtual IP addresses that you don't want to lose. These settings are lost when your reach your spending limit and the services and resources are de-allocated.
6060

0 commit comments

Comments
 (0)