Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into work-mgr-meta2

Author: Heidilohr

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

@@ -7,7 +7,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: B2B
 ms.topic: conceptual
-ms.date: 11/1/2019
+ms.date: 03/05/2020
 
 ms.author: mimart
 author: msmimart
@@ -53,25 +53,24 @@ First, create a new project in the Google Developers Console to obtain a client
 
    ![Screenshot showing a New project page for Google](media/google-federation/google-new-project.png)
 
-3. Make sure your new project is selected in the project menu. Then open the menu in the upper left and select **APIs & Services** > **Credentials**.
+3. Make sure your new project is selected in the project menu. Then under **APIs & Services**, select **OAuth consent screen**.
 
-   ![Screenshot showing the Google API credentials option](media/google-federation/google-api.png)
- 
-4. Choose the **OAuth consent screen** tab and enter an **Application name**. (Leave the other settings.)
+4. Select **External**, and then select **Create**. 
+5. On the **OAuth consent screen**, enter an **Application name**. (Leave the other settings.)
 
    ![Screenshot showing the Google OAuth consent screen option](media/google-federation/google-oauth-consent-screen.png)
 
-5. Scroll to the **Authorized domains** section and enter microsoftonline.com.
+6. Scroll to the **Authorized domains** section and enter microsoftonline.com.
 
    ![Screenshot showing the Authorized domains section](media/google-federation/google-oauth-authorized-domains.png)
 
-6. Select **Save**.
+7. Select **Save**.
 
-7. Choose the **Credentials** tab. In the **Create credentials** menu, choose **OAuth client ID**.
+8. Choose **Credentials**. In the **Create credentials** menu, choose **OAuth client ID**.
 
    ![Screenshot showing the Google APIs create credentials option](media/google-federation/google-api-credentials.png)
 
-8. Under **Application type**, choose **Web application**, and then under **Authorized redirect URIs**, enter the following URIs:
+9. Under **Application type**, choose **Web application**, and then under **Authorized redirect URIs**, enter the following URIs:
    - `https://login.microsoftonline.com` 
    - `https://login.microsoftonline.com/te/<directory id>/oauth2/authresp` <br>(where `<directory id>` is your directory ID)
 
@@ -80,7 +79,7 @@ First, create a new project in the Google Developers Console to obtain a client
 
    ![Screenshot showing the Authorized redirect URIs section](media/google-federation/google-create-oauth-client-id.png)
 
-9. Select **Create**. Copy the client ID and client secret, which you'll use when you add the identity provider in the Azure AD portal.
+10. Select **Create**. Copy the client ID and client secret, which you'll use when you add the identity provider in the Azure AD portal.
 
    ![Screenshot showing the OAuth client ID and client secret](media/google-federation/google-auth-client-id-secret.png)
 

articles/active-directory/b2b/media/google-federation/google-api.png

@@ -58,6 +58,8 @@ az aks create \
 > - Any range that represents networks that you'll administer the cluster from
 > - If you are using Azure Dev Spaces on your AKS cluster, you have to allow [additional ranges based on your region][dev-spaces-ranges].
 
+> The upper limit for the number of IP ranges you can specify is 3500. 
+
 ### Specify the outbound IPs for the Standard SKU load balancer
 
 When creating an AKS cluster, if you specify the outbound IP addresses or prefixes for the cluster, those addresses or prefixes are allowed as well. For example:

articles/active-directory/b2b/media/google-federation/google-oauth-consent-screen.png

@@ -18,10 +18,10 @@ To learn more about using REST APIs with Azure Analysis Services, see [Asynchron
 
 All calls must be authenticated with a valid Azure Active Directory (OAuth 2) token.  The examples in this article will use a Service Principal (SPN) to authenticate to Azure Analysis Services. To learn more, see [Create a service principal by using Azure portal](../active-directory/develop/howto-create-service-principal-portal.md).
 
-## Design the Logic App
+## Design the logic app
 
 > [!IMPORTANT]
-> The following examples assume that the Azure Analysis Services firewall is disabled.  If the firewall is enabled, then the public IP address of the request initiator must be whitelisted in the Azure Analysis Services firewall. To learn more about Logic App IP ranges per region, see [Limits and configuration information for Azure Logic Apps](../logic-apps/logic-apps-limits-and-config.md#firewall-configuration-ip-addresses).
+> The following examples assume that the Azure Analysis Services firewall is disabled. If the firewall is enabled, the public IP address of the request initiator must be whitelisted in the Azure Analysis Services firewall. To learn more about Azure Logic Apps IP ranges per region, see [Limits and configuration information for Azure Logic Apps](../logic-apps/logic-apps-limits-and-config.md#configuration).
 
 ### Prerequisites
 

articles/aks/api-server-authorized-ip-ranges.md

@@ -6,14 +6,14 @@ cloud: gov
 author: todorgb
 ms.service: azure-government
 ms.topic: article
-ms.date: 12/18/2019
+ms.date: 03/11/2020
 ms.author: todorb
 ---
 # Azure Government authorized reseller list
 
 Since the launch of the [Azure Government in the Cloud Solution Provider Program (CSP)](https://azure.microsoft.com/blog/announcing-microsoft-azure-government-services-in-the-cloud-solution-provider-program/), work has been done with the Partner Community to bring them the benefits of this channel, enable them to resell Azure Government, and help them grow their business while providing the cloud services their customers need.
 
-Below you can find a list of all the authorized Cloud Solution Providers, which can resell Azure Government. This list includes all approved CSPs as of **December 18, 2019** as well as the list of Licensing Solution Providers (LSP). Updates to this list will be made as new partners are onboarded. 
+Below you can find a list of all the authorized Cloud Solution Providers, which can resell Azure Government. This list includes all approved CSPs as of **March 11, 2019** as well as the list of Licensing Solution Providers (LSP). Updates to this list will be made as new partners are onboarded. 
 
 ## Approved direct CSPs
 
@@ -85,6 +85,7 @@ Below you can find a list of all the authorized Cloud Solution Providers, which
 |[Ciracom Inc.](https://ciracom.com)|
 |[ClearShark](https://clearshark.com/)|
 |[CloudFit Software, LLC](https://www.cloudfitsoftware.com/)|
+|[Cloud Navigator, Inc - formerly ISC](https://www.cloudnav.com )|
 |[CNSS - Cherokee Nation System Solutions LLC](http://cherokee-cnt.com/Pages/home.aspx)|
 |[CodeLynx, LLC](https://www.codelynx.com/)|
 |[Competitive Innovations, LLC](https://www.cillc.com)|
@@ -184,7 +185,6 @@ Below you can find a list of all the authorized Cloud Solution Providers, which
 |[Integration Partners Corp.](https://integrationpartners.com/)|
 |[Intelice Solutions, LLC](https://www.intelice.com/)|
 |[Invoke, LLC](https://invokellc.com)|
-|[ISC](https://www.isc2.org/)|
 |[It1 Source LLC](https://www.it1.com)|
 |[ITInfra](https://itinfra.biz/)|
 |[IV4, Inc](https://www.iv4.com)|
@@ -390,7 +390,7 @@ Below you can find a list of all the authorized Cloud Solution Providers, which
 |SoftwareONE|[email protected]|800-444-9890|
 |Zones International|[email protected]|253-205-3000|
 
-## Approved 2019 AOS-G Partners
+## Approved 2020 AOS-G Partners
 
 |Partner Name|Phone|
 |----------------------------|---------------------------|
@@ -399,7 +399,7 @@ Below you can find a list of all the authorized Cloud Solution Providers, which
 |Arctic Information Technology, Inc.|907-261-9500|
 |C3 Integrated Solutions, Inc.|571-384-7950|
 |Catapult Systems, LLC|512-225-6916|
-|ISC|850-566-8421|
+|Cloud Navigator, Inc - formerly ISC|800-619-7377|
 |KTL Solutions, Inc.|301-360-0001|
 |LiftOff LLC|410-419-1591|
 |Permuta Technologies, Inc.|703-650-5040|

articles/analysis-services/analysis-services-refresh-logic-app.md

@@ -17,7 +17,7 @@ highlightedContent:
       url: cost-management-billing-overview.md
     - title: Analyze costs and create budgets
       itemType: learn
-      url: https://docs.microsoft.com/learn/modules/analyze-costs-create-budgets-azure-cost-management/
+      url: https://docs.microsoft.com/learn/modules/analyze-costs-create-budgets-azure-cost-management/?WT.mc_id=costmanagementcontent_docsazurebilling_-inproduct-learn
     - title: Cost Management best practices
       itemType: concept
       url: ./costs/cost-mgt-best-practices.md

articles/azure-government/documentation-government-csp-list.md

@@ -6,7 +6,7 @@ ms.reviewer: amberb
 tags: billing
 ms.service: cost-management-billing
 ms.topic: conceptual
-ms.date: 02/13/2020
+ms.date: 3/11/2020
 ms.author: banders
 ---
 # Prevent unexpected charges with Azure billing and cost management
@@ -20,6 +20,8 @@ When you sign up for Azure, there are several things you can do to get a better
 - Use additional resources and tools for Enterprise Agreement (EA), Cloud Solution Provider (CSP), and Azure Sponsorship customers.
 - Make use of [some of the most popular Azure services for free for 12 months](create-free-services.md) available with the [Azure free account](https://azure.microsoft.com/free/). Along with the recommendations listed below, see [Avoid getting charged for free account](avoid-charges-free-account.md).
 
+If you need to cancel your Azure subscription, see [Cancel your Azure subscription](cancel-azure-subscription.md).
+
 ## Get estimated costs before adding Azure services
 
 Use one of the following tools to estimate the cost of using an Azure service:
@@ -153,15 +155,15 @@ If you have access to Azure through a Microsoft Customer Agreement (MCA) billing
 
 ### Request a Service Level Agreement credit for a service incident
 
-The Service Level Agreement (SLA) describes Microsoft’s commitments for uptime and connectivity. A service incident is reported when Azure services experience an issue that impacts uptime or connectivity, often referred to as an *outage*. If we do not achieve and maintain the Service Levels for each service as described in the SLA, then you might be eligible for a credit towards a portion of your monthly service fees.
+The Service Level Agreement (SLA) describes Microsoft's commitments for uptime and connectivity. A service incident is reported when Azure services experience an issue that impacts uptime or connectivity, often referred to as an *outage*. If we do not achieve and maintain the Service Levels for each service as described in the SLA, then you might be eligible for a credit towards a portion of your monthly service fees.
 
 To request a credit:
 
 1. Sign in to the [Azure portal](https://portal.azure.com/). If you have multiple accounts, make sure that you use the one that was affected by Azure downtime.
 2. Create a new support request.
 3. Under **Issue type**, select **Billing**.
 4. Under **Problem type**, select **Refund Request**.
-5. Add details to specify that you’re asking for an SLA credit, mention the date/time/time-zone as well as the impacted services (VMs, Web Sites, etc.)
+5. Add details to specify that you're asking for an SLA credit, mention the date/time/time-zone as well as the impacted services (VMs, Web Sites, etc.)
 6. Verify your contact details and select **Create** to submit your request.
 
 SLA thresholds vary by service. For example, the SQL Web Tier has an SLA of 99.9%, VMs have an SLA of 99.95%, and SQL Standard Tier has an SLA of 99.99%.