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

commit

Author: asudbring

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

@@ -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/active-directory/b2b/media/google-federation/google-oauth-consent-screen.png

@@ -5,7 +5,7 @@ author: cedarbaum
 ms.author: sacedarb
 ms.service: stream-analytics
 ms.topic: conceptual
-ms.date: 07/12/2019
+ms.date: 03/11/2020
 ---
 
 # Use Managed Identity to authenticate your Azure Stream Analytics job to Azure Blob Storage output