Skip to content

Commit 57b7356

Browse files
authored
Merge pull request #174683 from MicrosoftDocs/master
10/05 PM Publish
2 parents c27f71f + 58ffa27 commit 57b7356

File tree

162 files changed

+4543
-687
lines changed

Some content is hidden

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

162 files changed

+4543
-687
lines changed

articles/active-directory-b2c/claimstransformations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ The **OutputClaim** element contains the following attributes:
111111
| ClaimTypeReferenceId | Yes | A reference to a ClaimType already defined in the ClaimsSchema section in the policy.
112112
| TransformationClaimType | Yes | An identifier to reference a transformation claim type. Each claim transformation has its own values. See the [claims transformation reference](#claims-transformations-reference) for a complete list of the available values. |
113113

114-
If input claim and the output claim are the same type (string, or boolean), you can use the same input claim as the output claim. In this case, the claims transformation changes the input claim with the output value.
114+
Input and output claims used in claims transformation need to be distinct. The same input claim cannot be used as the output claim.
115115

116116
## Example
117117

articles/active-directory-b2c/embedded-login.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ zone_pivot_groups: b2c-policy-type
2828

2929
::: zone pivot="b2c-custom-policy"
3030

31-
For a simpler sing-up or sign-in experience, you can avoid redirecting users to a separate sing-up or sign-in page, or generating a pop-up window. By using the inline frame <iframe> HTML element, you can embed the Azure AD B2C sign-in user interface directly into your web application.
31+
For a simpler sign-up or sign-in experience, you can avoid redirecting users to a separate sign-up or sign-in page, or generating a pop-up window. By using the inline frame <iframe> HTML element, you can embed the Azure AD B2C sign-in user interface directly into your web application.
3232

3333
> [!TIP]
3434
> Use the <iframe> HTML element to embed the [sign-up or sign-in](add-sign-up-and-sign-in-policy.md), [edit profile](add-profile-editing-policy.md), or [change password](add-password-change-policy.md) custom policies into your web or single page app.

articles/active-directory/authentication/howto-password-ban-bad-on-premises-agent-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: article
9-
ms.date: 11/21/2019
9+
ms.date: 06/04/2021
1010

1111
ms.author: justinha
1212
author: justinha

articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ When you add a new application from the gallery and configure a SAML-based sign-
2626

2727
![SAML active signing certificate download options](./media/manage-certificates-for-federated-single-sign-on/active-certificate-download-options.png)
2828

29+
SAML signing certificates generated by Azure when creating the application are app-specific, and hence each certificate is unique to each app instance. Using the same SAML certificate for all application instances is not supported. If you would like to use same SAML certificate for all app instances, you will need to generate your own SAML certificate with a private key and upload it to all app instances. SAML signing certificates generated by Azure won't have a private key (even if exporting the raw certificate).
30+
2931
You can also download an active or inactive certificate by selecting the **SAML Signing Certificate** heading's **Edit** icon (a pencil), which displays the **SAML Signing Certificate** page. Select the ellipsis (**...**) next to the certificate you want to download, and then choose which certificate format you want. You have the additional option to download the certificate in privacy-enhanced mail (PEM) format. This format is identical to Base64 but with a **.pem** file name extension, which isn't recognized in Windows as a certificate format.
3032

3133
![SAML signing certificate download options (active and inactive)](./media/manage-certificates-for-federated-single-sign-on/all-certificate-download-options.png)

articles/aks/azure-netapp-files.md

Lines changed: 276 additions & 20 deletions
Large diffs are not rendered by default.

articles/aks/configure-azure-cni.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This article shows you how to use *Azure CNI* networking to create and use a vir
2323
* `Microsoft.Network/virtualNetworks/subnets/join/action`
2424
* `Microsoft.Network/virtualNetworks/subnets/read`
2525
* The subnet assigned to the AKS node pool cannot be a [delegated subnet](../virtual-network/subnet-delegation-overview.md).
26-
* If you provide your own subnet, you have to manage the Network Security Groups (NSG) associated with that subnet. AKS will not modify any of the NSGs associated with that subnet. You also must ensure the security rules in the NSGs allow traffic between the node and pod CIDR ranges.
26+
* AKS doesn't apply Network Security Groups (NSGs) to its subnet and will not modify any of the NSGs associated with that subnet. If you provide your own subnet and add NSGs associated with that subnet, you must ensure the security rules in the NSGs allow traffic between the node and pod CIDR ranges. For more details, see [Network security groups][aks-network-nsg].
2727

2828
## Plan IP addressing for your cluster
2929

@@ -354,6 +354,7 @@ Learn more about networking in AKS in the following articles:
354354
[aks-ssh]: ssh.md
355355
[ManagedClusterAgentPoolProfile]: /azure/templates/microsoft.containerservice/managedclusters#managedclusteragentpoolprofile-object
356356
[aks-network-concepts]: concepts-network.md
357+
[aks-network-nsg]: concepts-network.md#network-security-groups
357358
[aks-ingress-basic]: ingress-basic.md
358359
[aks-ingress-tls]: ingress-tls.md
359360
[aks-ingress-static-tls]: ingress-static-ip.md
@@ -368,4 +369,4 @@ Learn more about networking in AKS in the following articles:
368369
[nodepool-upgrade]: use-multiple-node-pools.md#upgrade-a-node-pool
369370
[network-comparisons]: concepts-network.md#compare-network-models
370371
[system-node-pools]: use-system-pools.md
371-
[prerequisites]: configure-azure-cni.md#prerequisites
372+
[prerequisites]: configure-azure-cni.md#prerequisites

articles/aks/configure-kubenet.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ With *Azure CNI*, each pod receives an IP address in the IP subnet, and can dire
5050
* Route tables and user-defined routes are required for using kubenet, which adds complexity to operations.
5151
* Direct pod addressing isn't supported for kubenet due to kubenet design.
5252
* Unlike Azure CNI clusters, multiple kubenet clusters can't share a subnet.
53-
* If you provide your own subnet, you have to manage the Network Security Groups (NSG) associated with that subnet. AKS will not modify any of the NSGs associated with that subnet. You also must ensure the security rules in the NSGs allow traffic between the node and pod CIDR.
53+
* AKS doesn't apply Network Security Groups (NSGs) to its subnet and will not modify any of the NSGs associated with that subnet. If you provide your own subnet and add NSGs associated with that subnet, you must ensure the security rules in the NSGs allow traffic between the node and pod CIDR. For more details, see [Network security groups][aks-network-nsg].
5454
* Features **not supported on kubenet** include:
5555
* [Azure network policies](use-network-policies.md#create-an-aks-cluster-and-enable-network-policy), but Calico network policies are supported on kubenet
5656
* [Windows node pools](./windows-faq.md)
@@ -250,6 +250,7 @@ With an AKS cluster deployed into your existing virtual network subnet, you can
250250
<!-- LINKS - Internal -->
251251
[install-azure-cli]: /cli/azure/install-azure-cli
252252
[aks-network-concepts]: concepts-network.md
253+
[aks-network-nsg]: concepts-network.md#network-security-groups
253254
[az-group-create]: /cli/azure/group#az_group_create
254255
[az-network-vnet-create]: /cli/azure/network/vnet#az_network_vnet_create
255256
[az-ad-sp-create-for-rbac]: /cli/azure/ad/sp#az_ad_sp_create_for_rbac

articles/aks/faq.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,7 @@ FIPS-enabled nodes are currently available in preview on Linux-based node pools.
285285
286286
## Can I configure NSGs with AKS?
287287
288-
If you provide your own subnet, you have to manage the Network Security Groups (NSG) associated with that subnet. AKS will only modify the NSGs at the NIC level and will not modify any of the NSGs associated with that subnet. If you're using CNI, you also must ensure the security rules in the NSGs allow traffic between the node and pod CIDR ranges. If you're using kubenet, you also must ensure the security rules in the NSGs allow traffic between the node and pod CIDR.
289-
288+
AKS doesn't apply Network Security Groups (NSGs) to its subnet and will not modify any of the NSGs associated with that subnet. AKS will only modify the NSGs at the NIC level. If you're using CNI, you also must ensure the security rules in the NSGs allow traffic between the node and pod CIDR ranges. If you're using kubenet, you also must ensure the security rules in the NSGs allow traffic between the node and pod CIDR. For more details, see [Network security groups](concepts-network.md#network-security-groups).
290289
291290
<!-- LINKS - internal -->
292291

articles/automation/update-management/configure-wuagent.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure Windows Update settings for Azure Automation Update Management
33
description: This article tells how to configure Windows Update settings to work with Azure Automation Update Management.
44
services: automation
55
ms.subservice: update-management
6-
ms.date: 05/04/2020
6+
ms.date: 10/05/2021
77
ms.topic: conceptual
88
---
99
# Configure Windows Update settings for Azure Automation Update Management
@@ -17,17 +17,22 @@ Azure Automation Update Management relies on the [Windows Update client](/window
1717

1818
Update Management respects many of the settings specified to control the Windows Update client. If you use settings to enable non-Windows updates, Update Management will also manage those updates. If you want to enable downloading of updates before an update deployment occurs, update deployment can be faster, more efficient, and less likely to exceed the maintenance window.
1919

20-
For additional recommendations on setting up WSUS in your Azure subscription and securely keep your Windows virtual machines up to date, review [Plan your deployment for updating Windows virtual machines in Azure using WSUS](/azure/architecture/example-scenario/wsus/).
20+
For other recommendations on setting up WSUS in your Azure subscription and securely keep your Windows virtual machines up to date, review [Plan your deployment for updating Windows virtual machines in Azure using WSUS](/azure/architecture/example-scenario/wsus/).
2121

2222
## Pre-download updates
2323

24-
To configure the automatic downloading of updates without automatically installing them, you can use Group Policy to [configure the Automatic Updates setting](/windows-server/administration/windows-server-update-services/deploy/4-configure-group-policy-settings-for-automatic-updates##configure-automatic-updates) to 3. This setting enables downloads of the required updates in the background, and notifies you that the updates are ready to install. In this way, Update Management remains in control of schedules, but allows downloading of updates outside the Update Management maintenance window. This behavior prevents `Maintenance window exceeded` errors in Update Management.
24+
To configure the automatic downloading of updates without automatically installing them, you can use Group Policy to [configure the Automatic Updates setting](/windows-server/administration/windows-server-update-services/deploy/4-configure-group-policy-settings-for-automatic-updates##configure-automatic-updates). There are two recommended values depending on the version of the operating system:
25+
26+
* Windows Server 2016 and later, set to a value of **7**.
27+
* Windows Server 2012 R2 and earlier, set to a value of **3**.
28+
29+
This setting enables downloads of the required updates in the background, and notifies you that the updates are ready to install. In this way, Update Management remains in control of schedules, but allows downloading of updates outside the Update Management maintenance window. This behavior prevents `Maintenance window exceeded` errors in Update Management.
2530

2631
You can enable this setting in PowerShell:
2732

2833
```powershell
2934
$WUSettings = (New-Object -com "Microsoft.Update.AutoUpdate").Settings
30-
$WUSettings.NotificationLevel = 3
35+
$WUSettings.NotificationLevel = <3 or 7>
3136
$WUSettings.Save()
3237
```
3338

0 commit comments

Comments
 (0)