Merge pull request #111490 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit f1d7f7cc510c · 2020-04-15T14:53:52.000-07:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
diff --git a/articles/active-directory/authentication/active-directory-certificate-based-authentication-ios.md b/articles/active-directory/authentication/active-directory-certificate-based-authentication-ios.md
@@ -24,7 +24,7 @@ iOS devices can use certificate-based authentication (CBA) to authenticate to Az
 
 Configuring this feature eliminates the need to enter a username and password combination into certain mail and Microsoft Office applications on your mobile device.
 
-This topic provides you with the requirements and the supported scenarios for configuring CBA on an iOS(Android) device for users of tenants in Office 365 Enterprise, Business, Education, US Government, China, and Germany plans.
+This topic provides you with the requirements and the supported scenarios for configuring CBA on an iOS device for users of tenants in Office 365 Enterprise, Business, Education, US Government, China, and Germany plans.
 
 This feature is available in preview in Office 365 US Government Defense and Federal plans.
 
diff --git a/articles/active-directory/saas-apps/fcm-hub-tutorial.md b/articles/active-directory/saas-apps/fcm-hub-tutorial.md
@@ -90,9 +90,18 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
     > [!NOTE]
 	> The value is not real. Update the value with the actual Sign-on URL. Contact account manager who is assigned to you or contact [FCM HUB Client support team](mailto:fcmssoadmin@us.fcm.travel) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
 
-1. Click **Save**.
+1. Select **Save**.
 
-1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section,  find **Certificate (Base64)** and select **Download** to download the certificate and save it on your computer.
+1. On the **Manage Claim** page, in the **User Attributes & Claims** section, add these custom attributes:
+   - **Name**: PortalID
+   - **Source**: Attribute
+   - **Source Attribute**: PortalID, value provided by FCM
+
+1. In the **SAML Signing Certificate** section, use the edit option to select or enter the following settings, and then select **Save**:
+   - **Signing Option**: Sign SAML response
+   - **Signing Algorithm**: SHA-256
+
+1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Certificate (Base64)** and select **Download** to download the certificate and save it on your computer.
 
 	![The Certificate download link](common/certificatebase64.png)
 
@@ -156,4 +165,4 @@ When you click the FCM HUB tile in the Access Panel, you should be automatically
 
 - [What is session control in Microsoft Cloud App Security?](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
 
-- [How to protect FCM HUB with advanced visibility and controls](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
+- [How to protect FCM HUB with advanced visibility and controls](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
diff --git a/articles/active-directory/saas-apps/rstudio-connect-tutorial.md b/articles/active-directory/saas-apps/rstudio-connect-tutorial.md
@@ -157,9 +157,9 @@ IdPAttributeProfile = azure
 SSOInitiated = IdPAndSP
 ```
 
-Store your **Server Address** in the `Server.Address` value, and the **App Federation Metadata Url** in the `SAML.IdPMetaData` value.
+Store your **Server Address** in the `Server.Address` value, and the **App Federation Metadata Url** in the `SAML.IdPMetaData` value. Note that this sample configuration uses an unencrypted HTTP connection, while Azure AD requires the use of an encrypted HTTPS connection. You can either use a [reverse proxy](https://docs.rstudio.com/connect/admin/proxy/) in front of RStudio Connect or configure RStudio Connect to [use HTTPS directly](https://docs.rstudio.com/connect/admin/appendix/configuration/#HTTPS). 
 
-If you have trouble with configuration, you can read the [RStudio Connect Admin Guide](https://docs.rstudio.com/connect/admin/authentication.html#authentication-saml) or email the [RStudio support team](mailto:support@rstudio.com) for help.
+If you have trouble with configuration, you can read the [RStudio Connect Admin Guide](https://docs.rstudio.com/connect/admin/authentication/saml/) or email the [RStudio support team](mailto:support@rstudio.com) for help.
 
 ### Create an Azure AD test user 
 
diff --git a/articles/azure-functions/functions-reference.md b/articles/azure-functions/functions-reference.md
@@ -6,7 +6,7 @@ ms.topic: conceptual
 ms.date: 10/12/2017
 
 ---
-# Azure Functions developers guide
+# Azure Functions developer guide
 In Azure Functions, specific functions share a few core technical concepts and components, regardless of the language or binding you use. Before you jump into learning details specific to a given language or binding, be sure to read through this overview that applies to all of them.
 
 This article assumes that you've already read the [Azure Functions overview](functions-overview.md).
diff --git a/articles/cost-management-billing/reservations/save-compute-costs-reservations.md b/articles/cost-management-billing/reservations/save-compute-costs-reservations.md
@@ -11,7 +11,7 @@ ms.author: banders
 
 # What are Azure Reservations?
 
-Azure Reservations help you save money by committing to one-year or three-years plans for multiple products. Committing allows you to get a discount on the resources you use. Reservations can significantly reduce your resource costs up to 72% on pay-as-you-go prices. Reservations provide a billing discount and don't affect the runtime state of your resources. After you purchase a reservation, the discount automatically applies to matching resources.
+Azure Reservations help you save money by committing to one-year or three-year plans for multiple products. Committing allows you to get a discount on the resources you use. Reservations can significantly reduce your resource costs up to 72% on pay-as-you-go prices. Reservations provide a billing discount and don't affect the runtime state of your resources. After you purchase a reservation, the discount automatically applies to matching resources.
 
 You can pay for a reservation up front or monthly. The total cost of up-front and monthly reservations is the same and you don't pay any extra fees when you choose to pay monthly. Monthly payment is available for Azure reservations, not third-party products.
 
diff --git a/articles/networking/edge-zones-overview.md b/articles/networking/edge-zones-overview.md
@@ -13,7 +13,7 @@ ms.author: ganesr
 
 # About Azure Edge Zones - Preview
 
-Azure Edge Zones is a family of offerings from Microsoft Azure that enables data processing close to the user. You can deploy VMs, containers, and other select Azure services into Edge Zones to address the low latency and high throughput requirements of applications.
+Azure Edge Zones is a family of offerings from Microsoft Azure that enables data processing close to the user. You can deploy VMs, containers, and other selected Azure services into Edge Zones to address the low latency and high throughput requirements of applications.
 
 Typical use case scenarios for Edge Zones include:
 
@@ -35,7 +35,7 @@ Azure Edge Zones come in three discrete offerings:
 
 ![Edge Zones](./media/edge-zones-overview/edge-zones.png "Edge zones")
 
-Azure Edge Zones are small footprint extensions of Azure placed in population centers that are far away from Azure regions. Azure Edge Zones support VMs, containers, and a select set of Azure services that let you run latency sensitive and throughput intensive applications close to end users. Azure Edge Zones are part of the Microsoft global network and offer secure, reliable, and high-bandwidth connectivity between applications running at the Edge Zone close to the user, and the full set of Azure services running within Azure regions. Azure Edge Zones are owned and operated by Microsoft and let you use the same set of Azure tools and portal to manage and deploy services into the Edge Zones.
+Azure Edge Zones are small footprint extensions of Azure placed in population centers that are far away from Azure regions. Azure Edge Zones support VMs, containers, and a selected set of Azure services that let you run latency sensitive and throughput intensive applications close to end users. Azure Edge Zones are part of the Microsoft global network and offer secure, reliable, and high-bandwidth connectivity between applications running at the Edge Zone close to the user, and the full set of Azure services running within Azure regions. Azure Edge Zones are owned and operated by Microsoft and let you use the same set of Azure tools and portal to manage and deploy services into the Edge Zones.
 
 Typical use cases include:
 
