Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into andrsmith/updateAutomageDocs

Author: andrsmith149

articles/active-directory/authentication/active-directory-certificate-based-authentication-get-started.md

@@ -14,7 +14,7 @@ manager: amycolannino
 ms.reviewer: annaba
 
 ms.collection: M365-identity-device-management
-ms.custom: has-adal-ref
+
 ---
 # Get started with certificate-based authentication in Azure Active Directory with federation
 
@@ -37,7 +37,7 @@ This topic:
 
 To configure CBA with federation, the following statements must be true:
 
-- CBA with federation is only supported for Federated environments for browser applications, native clients using modern authentication (ADAL), or MSAL libraries. The one exception is Exchange Active Sync (EAS) for Exchange Online (EXO), which can be used for federated and managed accounts. To configure Azure AD CBA without needing federation, see [How to configure Azure AD certificate-based authentication](how-to-certificate-based-authentication.md).
+- CBA with federation is only supported for Federated environments for browser applications, native clients using modern authentication, or MSAL libraries. The one exception is Exchange Active Sync (EAS) for Exchange Online (EXO), which can be used for federated and managed accounts. To configure Azure AD CBA without needing federation, see [How to configure Azure AD certificate-based authentication](how-to-certificate-based-authentication.md).
 - The root certificate authority and any intermediate certificate authorities must be configured in Azure Active Directory.
 - Each certificate authority must have a certificate revocation list (CRL) that can be referenced via an internet-facing URL.
 - You must have at least one certificate authority configured in Azure Active Directory. You can find related steps in the [Configure the certificate authorities](#step-2-configure-the-certificate-authorities) section.

articles/azure-relay/relay-faq.yml

@@ -40,26 +40,6 @@ sections:
         answer: |
           For complete information about Relay pricing, see the [Hybrid Connections and WCF Relays](https://azure.microsoft.com/pricing/details/service-bus) table on the Service Bus pricing details page. In addition to the prices noted on that page, you are charged for associated data transfers for egress outside of the datacenter in which your application is provisioned.
           
-      - question: |
-          How am I billed for Hybrid Connections?
-        answer: |
-          Here are three example billing scenarios for Hybrid Connections:
-          
-          *   Scenario 1:
-              *   You have a single listener, such as an instance of the Hybrid Connections Manager installed and continuously running for the entire month.
-              *   You send 3 GB of data across the connection during the month. 
-              *   Your total charge is $5.
-          *   Scenario 2:
-              *   You have a single listener, such as an instance of the Hybrid Connections Manager installed and continuously running for the entire month.
-              *   You send 10 GB of data across the connection during the month.
-              *   Your total charge is $7.50. That's $5 for the connection and first 5 GB + $2.50 for the additional 5 GB of data.
-          *   Scenario 3:
-              *   You have two instances, A and B, of the Hybrid Connections Manager installed and continuously running for the entire month.
-              *   You send 3 GB of data across connection A during the month.
-              *   You send 6 GB of data across connection B during the month.
-              *   Your total charge is $10.50. That's $5 for connection A + $5 for connection B + $0.50 (for the sixth gigabyte on connection B).
-          
-          
       - question: |
           How are hours calculated for Relay?
         answer: |