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

Author: spelluru

articles/active-directory/app-provisioning/export-import-provisioning-configuration.md

@@ -18,10 +18,18 @@ ms.author: chmutali
 
 ms.collection: M365-identity-device-management
 ---
-# Export or import your provisioning configuration by using the Microsoft Graph API
-
-You can use the Microsoft Graph API and the Microsoft Graph Explorer to export your User Provisioning attribute mappings and schema to a JSON file and import it back into Azure AD. You can also use the steps captured here to create a backup of your provisioning configuration. 
-
+# Export your provisioning configuration and roll back to a known good state
+
+## Export and import your provisioning configuration from the Azure portal
+### How can I export my provisioning configuration?
+To export your configuration:
+1. In the [Azure portal](https://portal.azure.com/), on the left navigation panel, select **Azure Active Directory**.
+2. In the **Azure Active Directory** pane, select **Enterprise applications** and choose your application.
+3. In the left navigation pane, select **provisioning**. From the provisioning configuration page, click on **attribute mappings**, then **show advanced options**, and finally **review your schema**. This will take you to the schema editor. 
+5. Click on download in the command bar at the top of the page to download your schema.
+
+### Disaster recovery - roll back to a known good state
+Exporting and saving your configuration allows you to roll back to a previous version of your configuration. We recommend exporting your provisioning configuration and saving it for later use anytime you make a change to your attribute mappings or scoping filters. All you need to do is open up the JSON file that you downloaded in the steps above, copy the entire contents of the JSON file, replace the entire contents of the JSON payload in the schema editor, and then save. If there is an active provisioning cycle, it will complete and the next cycle will use the updated schema. The next cycle will also be an initial cycle, which reevaluates every user and group based on the new configuration. 
 ## Step 1: Retrieve your Provisioning App Service Principal ID (Object ID)
 
 1. Launch the [Azure portal](https://portal.azure.com), and navigate to the Properties section of your  provisioning application. For e.g. if you want to export your *Workday to AD User Provisioning application* mapping navigate to the Properties section of that app. 

articles/api-management/api-management-transformation-policies.md

@@ -73,7 +73,7 @@ This topic provides a reference for the following API Management policies. For i
 |Name|Description|Required|Default|
 |----------|-----------------|--------------|-------------|
 |apply|The attribute must be set to one of the following values.<br /><br /> -   always - always apply conversion.<br />-   content-type-json - convert only if response Content-Type header indicates presence of JSON.|Yes|N/A|
-|consider-accept-header|The attribute must be set to one of the following values.<br /><br /> -   true - apply conversion if JSON is requested in request Accept header.<br />-   false -always apply conversion.|No|true|
+|consider-accept-header|The attribute must be set to one of the following values.<br /><br /> -   true - apply conversion if XML is requested in request Accept header.<br />-   false -always apply conversion.|No|true|
 |parse-date|When set to `false` date values are simply copied during transformation|No|true|
 
 ### Usage
@@ -118,7 +118,7 @@ This topic provides a reference for the following API Management policies. For i
 |----------|-----------------|--------------|-------------|
 |kind|The attribute must be set to one of the following values.<br /><br /> -   javascript-friendly - the converted JSON has a form friendly to JavaScript developers.<br />-   direct - the converted JSON reflects the original XML document's structure.|Yes|N/A|
 |apply|The attribute must be set to one of the following values.<br /><br /> -   always - convert always.<br />-   content-type-xml - convert only if response Content-Type header indicates presence of XML.|Yes|N/A|
-|consider-accept-header|The attribute must be set to one of the following values.<br /><br /> -   true - apply conversion if XML is requested in request Accept header.<br />-   false -always apply conversion.|No|true|
+|consider-accept-header|The attribute must be set to one of the following values.<br /><br /> -   true - apply conversion if JSON is requested in request Accept header.<br />-   false -always apply conversion.|No|true|
 
 ### Usage
  This policy can be used in the following policy [sections](https://azure.microsoft.com/documentation/articles/api-management-howto-policies/#sections) and [scopes](https://azure.microsoft.com/documentation/articles/api-management-howto-policies/#scopes).

articles/app-service/app-service-web-tutorial-php-mysql.md

@@ -208,7 +208,8 @@ az mysql server firewall-rule create --name AllowLocalClient --server <mysql_ser
 In the local terminal window, connect to the MySQL server in Azure. Use the value you specified previously for _&lt;mysql_server_name>_. When prompted for a password, use the password you specified when you created the database in Azure.
 
 ```bash
-mysql -u <admin_user>@<mysql_server_name> -h <mysql_server_name>.mysql.database.azure.com -P 3306 -p
+mysql -u <admin_user>@<mysql_server_name> -h <mysql_server_name>.mysql.database.azure.com -P 3306 -p<PASSWORD> --ssl-mode=REQUIRED --ssl-ca=<PATH_TO_PEM>
+
 ```
 
 ### Create a production database

articles/azure-functions/functions-bindings-timer.md

@@ -314,7 +314,7 @@ Expressed as a string, the `TimeSpan` format is `hh:mm:ss` when `hh` is less tha
 |---------|---------|
 |"01:00:00" | every hour        |
 |"00:01:00"|every minute         |
-|"24:00:00" | every 24 hours        |
+|"24:00:00" | every 24 days        |
 |"1.00:00:00" | every day        |
 
 ## Scale-out

articles/azure-monitor/platform/alerts-activity-log.md

@@ -123,7 +123,7 @@ A simple analogy for understanding conditions on which alert rules can be create
 
 
 ## Azure Resource Manager template
-To create an activity log rule by using an Azure Resource Manager template, you create a resource of the type `microsoft.insights/activityLogAlerts`. Then you fill in all related properties. Here's a template that creates an activity log rule:
+To create an activity log alert rule by using an Azure Resource Manager template, you create a resource of the type `microsoft.insights/activityLogAlerts`. Then you fill in all related properties. Here's a template that creates an activity log alert  rule:
 
 ```json
 {