Merge pull request #299 from MicrosoftDocs/master

rmerge

Author: MatchaMatch

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/active-directory/authentication/howto-mfaserver-adfs-2012.md",
+      "redirect_url": "/azure/active-directory/authentication/howto-mfaserver-adfs-windows-server",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/blobs/storage-c-plus-plus-how-to-use-blobs.md",
       "redirect_url": "/azure/storage/blobs/quickstart-blobs-c-plus-plus",
@@ -16463,6 +16468,11 @@
       "redirect_url": "/azure/developer/chef/windows-vm-configure",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/organizations/integration-cisco-ise-pxgrid.md",
+      "redirect_url": "/azure/defender-for-iot/organizations/integration-forescout",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/defender-for-iot/organizations/integration-servicenow.md",
       "redirect_url": "/azure/defender-for-iot/organizations/tutorial-servicenow",
@@ -38903,6 +38913,11 @@
       "redirect_url": "/azure/backup/sap-hana-db-about",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/virtual-machines/workloads/sap/azure-monitor-overview.md",
+      "redirect_url": "/azure/virtual-machines/workloads/sap/monitor-sap-on-azure",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/migrate/how-to-scale-assessment.md",
       "redirect_url": "scale-hyper-v-assessment",
@@ -56262,6 +56277,11 @@
       "source_path_from_root": "/articles/storage/files/storage-files-enable-smb-multichannel.md",
       "redirect_url": "/azure/storage/files/files-smb-protocol#smb-multichannel",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-cache-for-redis/cache-best-practices.md",
+      "redirect_url": "/azure/azure-cache-for-redis/index",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/TOC.yml

@@ -430,6 +430,8 @@
       displayName: account, accounts, msgraph, ms graph, graph
     - name: Deploy with Azure Pipelines
       href: deploy-custom-policies-devops.md
+    - name: Deploy with GitHub Actions
+      href: deploy-custom-policies-github-action.md
       displayName: azure devops, ci/cd, cicd, custom policy, policies
     - name: Manage policies with PowerShell
       href: manage-custom-policies-powershell.md

articles/active-directory-b2c/add-api-connector-token-enrichment.md

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 08/04/2021
+ms.date: 08/29/2021
 ms.author: mimart
 ms.subservice: B2C
 zone_pivot_groups: b2c-policy-type
@@ -88,7 +88,6 @@ Content-type: application/json
  "objectId": "ab3ec3b2-a435-45e4-b93a-56a005e88bb7",
  "extension_<extensions-app-id>_CustomAttribute1": "custom attribute value",
  "extension_<extensions-app-id>_CustomAttribute2": "custom attribute value",
- "objectId": "ab3ec3b2-a435-45e4-b93a-56a005e88bb7",
  "client_id": "231c70e8-8424-48ac-9b5d-5623b9e4ccf3",
  "step": "PreTokenIssuance",
  "ui_locales":"en-US"

articles/active-directory-b2c/billing.md

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.topic: reference
 ms.workload: identity
-ms.date: 05/28/2021
+ms.date: 08/26/2021
 ms.author: mimart
 ms.subservice: B2C
 ms.custom: fasttrack-edit
@@ -18,6 +18,15 @@ ms.custom: fasttrack-edit
 
 Azure Active Directory B2C (Azure AD B2C) pricing is based on monthly active users (MAU), which is the count of unique users with authentication activity within a calendar month. This billing model applies to both Azure AD B2C tenants and [Azure AD guest user collaboration (B2B)](../active-directory/external-identities/external-identities-pricing.md). MAU billing helps you reduce costs by offering a free tier and flexible, predictable pricing. In this article, learn about MAU billing, linking your Azure AD B2C tenants to a subscription, and changing your pricing tier.
 
+## MAU overview
+
+A monthly active user (MAU) is a unique user that performs an authentication within a given month. A user that authenticates multiple times within a given month is counted as one MAU. Customers are not charged for a MAU’s subsequent authentications during the month, nor for inactive users. Authentications may include:
+
+- Active, interactive sign-in by the user, for example through [sign-up or sign-in](add-sign-up-and-sign-in-policy.md), [self-service password reset](add-password-reset-policy.md), [profile editing](add-profile-editing-policy.md), or any type of [user flow](user-flow-overview.md) or [custom policy](custom-policy-overview.md).
+- Passive, non-interactive sign-in such as [single sign-on (SSO)](session-behavior.md), or any type of token acquisition, such as authorization code flow, token refresh, or [resource owner password credentials (ROPC)](add-ropc-policy.md).
+
+If you choose to provide higher levels of assurance using Multi-factor Authentication (MFA) for Voice and SMS, you will continue to be charged a worldwide flat fee for each MFA attempt that month, whether the sign-in is successful or unsuccessful. 
+
 > [!IMPORTANT]
 > This article does not contain pricing details. For the latest information about usage billing and pricing, see [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/). See also [Azure AD B2C region availability and data residency](data-residency.md) for details about where the Azure AD B2C service is available and where user data is stored.
 
@@ -185,4 +194,4 @@ If the source and destination subscriptions are associated with different Azure
 
 ## Next steps
 
-For the latest pricing information, see [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
+For the latest pricing information, see [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).