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

Author: HeidiSteen

articles/app-service/toc.yml

@@ -29,7 +29,7 @@
       href: quickstart-wordpress.md
     - name: Deploy Go (experimental)
       href: quickstart-golang.md
-- name: Deployment
+- name: Deployment and configuration
   items:
     - name: Deployment best practices
       href: deploy-best-practices.md
@@ -55,7 +55,7 @@
           href: configure-language-java.md
         - name: Configure Ruby
           href: configure-language-ruby.md
-    - name: Deploy an app
+    - name: Deployment methods
       items:
         - name: Use ZIP or WAR
           href: deploy-zip.md

articles/azure-resource-manager/bicep/deployment-stacks.md

@@ -2,7 +2,7 @@
 title: Create & deploy deployment stacks in Bicep
 description: Describes how to create deployment stacks in Bicep.
 ms.topic: conceptual
-ms.date: 07/10/2023
+ms.date: 07/12/2023
 ---
 
 # Deployment stacks (Preview)
@@ -35,8 +35,9 @@ Deployment stacks provide the following benefits:
 - [What-if](./deploy-what-if.md) isn't available in the preview.
 - Management group scoped deployment stacks can only deploy the template to subscription.
 - When using the Azure CLI create command to modify an existing stack, the deployment process continues regardless of whether you choose _n_ for a prompt. To halt the procedure, use _[CTRL] + C_.
+- There is an issue with the Azure CLI create command when the value `none` is passed to the `deny-settings-mode` parameter. Before the issue is fixed, use the `denyDelete` instead of `none`.
 - If you create or modify a deployment stack in the Azure portal, deny settings will be overwritten (support for deny settings in the Azure portal is currently in progress).
-- Management group deployment stacks not yet available in the Azure portal.
+- Management group deployment stacks are not yet available in the Azure portal.
 
 
 ## Create deployment stacks

articles/communication-services/concepts/telephony/trial-phone-numbers-faq.md

@@ -49,7 +49,10 @@ While the trial phone number itself is provided at no cost during the trial peri
 Verifying the recipient phone number is a security measure that ensures the trial phone number can only make calls to the verified number. This helps protect against misuse and unauthorized usage of trial phone numbers.
 
 ### How is the recipient phone number verified?
-The verification process involves sending a one-time passcode via SMS to the recipient phone number. The recipient needs to enter this code in the Azure portal to complete the verification.
+The verification process involves sending a one-time passcode via SMS to the recipient phone number. The recipient needs to enter this code in the Azure portal to complete the verification. 
+
+### From where can I verify phone numbers?
+Currently, only phone numbers that originate from the United States (i.e., have a +1 preffix) can be verified for use with trial phone numbers. 
 
 ### Can I verify multiple recipient phone numbers for the same trial phone number?
 Currently the trial phone number can be verified for up to three recipient phone numbers. If you need to make calls to more numbers, then you'll need to [purchase a phone number](../../quickstarts/telephony/get-phone-number.md)

articles/communication-services/concepts/troubleshooting-info.md

@@ -162,22 +162,22 @@ Console.WriteLine($"Email operation id = {emailSendOperation.Id}");
 # [JavaScript](#tab/javascript)
 
 The Azure Communication Services Calling SDK relies internally on [@azure/logger](https://www.npmjs.com/package/@azure/logger) library to control logging.
-Use the `setLogLevel` method from the `@azure/logger` package to configure the log output:
+Use the `setLogLevel` method from the `@azure/logger` package to configure the log output level. Create a logger and pass it into the CallClient constructor:
 
 ```javascript
-import { setLogLevel } from '@azure/logger';
+import { setLogLevel, createClientLogger, AzureLogger } from '@azure/logger';
 setLogLevel('verbose');
-const callClient = new CallClient();
+let logger = createClientLogger('ACS');
+const callClient = new CallClient({ logger });
 ```
 
 You can use AzureLogger to redirect the logging output from Azure SDKs by overriding the `AzureLogger.log` method:
 This value may be useful if you want to redirect logs to a location other than console.
 
 ```javascript
-import { AzureLogger } from '@azure/logger';
 // redirect log output
 AzureLogger.log = (...args) => {
-  console.log(...args); // to console, file, buffer, REST API..
+  console.log(...args); // to console, file, buffer, REST API, etc...
 };
 ```
 

articles/communication-services/samples/chat-hero-sample.md

@@ -26,7 +26,7 @@ In this Sample quickstart, we'll learn how the sample works before we run the sa
 
 ## Overview
 
-The sample has both a client-side application and a server-side application. The **client-side application** is a React/Redux web application that uses Microsoft's Fluent UI framework. This application sends requests to an ASP.NET Core **server-side application** that helps the client-side application connect to Azure.
+The sample has both a client-side application and a server-side application. The **client-side application** is a React/Redux web application that uses Microsoft's Fluent UI framework. This application sends requests to a Node.js **server-side application** that helps the client-side application connect to Azure.
 
 Here's what the sample looks like:
 

articles/data-factory/connector-salesforce.md

@@ -164,6 +164,57 @@ The following properties are supported for the Salesforce linked service.
 }
 ```
 
+**Example: Store credentials in Key Vault, as well as environmentUrl and username**
+
+Note that by doing so, you will no longer be able to use the UI to edit settings.  The ***Specify dynamic contents in JSON format*** checkbox will be checked, and you will have to edit this configuration entirely by hand.  The advantage is you can derive ALL configuration settings from the Key Vault instead of parameterizing anything here.
+
+```json
+{
+    "name": "SalesforceLinkedService",
+    "properties": {
+        "type": "Salesforce",
+        "typeProperties": {
+            "environmentUrl": {
+                "type": "AzureKeyVaultSecret",
+                "secretName": "<secret name of environment URL in AKV>",
+                "store": {
+                    "referenceName": "<Azure Key Vault linked service>",
+                    "type": "LinkedServiceReference"
+                },
+            },
+            "username": {
+                "type": "AzureKeyVaultSecret",
+                "secretName": "<secret name of username in AKV>",
+                "store": {
+                    "referenceName": "<Azure Key Vault linked service>",
+                    "type": "LinkedServiceReference"
+                },
+            },
+            "password": {
+                "type": "AzureKeyVaultSecret",
+                "secretName": "<secret name of password in AKV>",
+                "store":{
+                    "referenceName": "<Azure Key Vault linked service>",
+                    "type": "LinkedServiceReference"
+                }
+            },
+            "securityToken": {
+                "type": "AzureKeyVaultSecret",
+                "secretName": "<secret name of security token in AKV>",
+                "store":{
+                    "referenceName": "<Azure Key Vault linked service>",
+                    "type": "LinkedServiceReference"
+                }
+            }
+        },
+        "connectVia": {
+            "referenceName": "<name of Integration Runtime>",
+            "type": "IntegrationRuntimeReference"
+        }
+    }
+}
+```
+
 ## Dataset properties
 
 For a full list of sections and properties available for defining datasets, see the [Datasets](concepts-datasets-linked-services.md) article. This section provides a list of properties supported by the Salesforce dataset.
@@ -381,4 +432,4 @@ To learn details about the properties, check [Lookup activity](control-flow-look
 
 
 ## Next steps
-For a list of data stores supported as sources and sinks by the copy activity, see [Supported data stores](copy-activity-overview.md#supported-data-stores-and-formats).
+For a list of data stores supported as sources and sinks by the copy activity, see [Supported data stores](copy-activity-overview.md#supported-data-stores-and-formats).

articles/data-factory/continuous-integration-delivery-sample-script.md

@@ -24,7 +24,7 @@ Install the latest Azure PowerShell modules by following instructions in [How to
 >[!WARNING]
 >Make sure to use **PowerShell Core** in ADO task to run the script
 
-## Pre- and post-deployment script
+## Pre- and post-deployment script 
 The sample scripts to stop/ start triggers and update global parameters during release process (CICD) are located in the [Azure Data Factory Official GitHub page](https://github.com/Azure/Azure-DataFactory/tree/main/SamplesV2/ContinuousIntegrationAndDelivery).
 
 > [!NOTE]
@@ -36,12 +36,12 @@ The sample scripts to stop/ start triggers and update global parameters during r
 The following sample script can be used to stop triggers before deployment and restart them afterward. The script also includes code to delete resources that have been removed. Save the script in an Azure DevOps  git repository and reference it via an Azure PowerShell task the latest Azure PowerShell version.
 
 
-When running a pre-deployment script, you will need to specify a variation of the following parameters in the **Script Arguments** field.
+When running a predeployment script, you need to specify a variation of the following parameters in the **Script Arguments** field.
 
 `-armTemplate "$(System.DefaultWorkingDirectory)/<your-arm-template-location>" -ResourceGroupName <your-resource-group-name> -DataFactoryName <your-data-factory-name>  -predeployment $true -deleteDeployment $false`
 
 
-When running a post-deployment script, you will need to specify a variation of the following parameters in the **Script Arguments** field.
+When running a postdeployment script, you need to specify a variation of the following parameters in the **Script Arguments** field.
 
 `-armTemplate "$(System.DefaultWorkingDirectory)/<your-arm-template-location>" -ResourceGroupName <your-resource-group-name> -DataFactoryName <your-data-factory-name>  -predeployment $false -deleteDeployment $true`
 
@@ -50,6 +50,42 @@ When running a post-deployment script, you will need to specify a variation of t
 
 :::image type="content" source="media/continuous-integration-delivery/continuous-integration-image11.png" alt-text="Azure PowerShell task":::
 
+## Script execution and parameters - YAML Pipelines
+The following YAML code executes a script that can be used to stop triggers before deployment and restart them afterward. The script also includes code to delete resources that have been removed. If you're following the steps outlined in [New CI/CD Flow](continuous-integration-delivery-improvements.md), this script is exported as part of artifact created via the npm publish package.
+
+### Stop ADF Triggers
+```
+ - task: AzurePowerShell@5
+            displayName: Stop ADF Triggers
+            inputs:
+              scriptType: 'FilePath'
+              ConnectedServiceNameARM: AzureDevServiceConnection
+              scriptPath: ../ADFTemplates/PrePostDeploymentScript.ps1
+              ScriptArguments: -armTemplate "<your-arm-template-location>" -ResourceGroupName <your-resource-group-name> -DataFactoryName <your-data-factory-name> -predeployment $true -deleteDeployment $false
+              errorActionPreference: stop
+              FailOnStandardError: False
+              azurePowerShellVersion: azurePowerShellVersion
+              preferredAzurePowerShellVersion: 3.1.0
+              pwsh: False
+              workingDirectory: ../
+```
+
+### Start ADF Triggers
+```
+          - task: AzurePowerShell@5
+            displayName: Start ADF Triggers
+            inputs:
+              scriptType: 'FilePath'
+              ConnectedServiceNameARM: AzureDevServiceConnection
+              scriptPath: ../ADFTemplates/PrePostDeploymentScript.ps1
+              ScriptArguments: -armTemplate "<your-arm-template-location>" -ResourceGroupName <your-resource-group-name> -DataFactoryName <your-data-factory-name>-predeployment $false -deleteDeployment $true
+              errorActionPreference: stop
+              FailOnStandardError: False
+              azurePowerShellVersion: azurePowerShellVersion
+              preferredAzurePowerShellVersion: 3.1.0
+              pwsh: False
+              workingDirectory: ../
+```
 
 ## Next steps
 

articles/data-factory/how-to-create-event-trigger.md

@@ -66,7 +66,7 @@ This section shows you how to create a storage event trigger within the Azure Da
 
 1. Select whether or not your trigger ignores blobs with zero bytes.
 
-1. After you configure you trigger, click on **Next: Data preview**. This screen shows the existing blobs matched by your storage event trigger configuration. Make sure you've specific filters. Configuring filters that are too broad can match a large number of files created/deleted and may significantly impact your cost. Once your filter conditions have been verified, click **Finish**.
+1. After you configure your trigger, click on **Next: Data preview**. This screen shows the existing blobs matched by your storage event trigger configuration. Make sure you've specific filters. Configuring filters that are too broad can match a large number of files created/deleted and may significantly impact your cost. Once your filter conditions have been verified, click **Finish**.
 
     :::image type="content" source="media/how-to-create-event-trigger/event-based-trigger-image-3.png" alt-text="Screenshot of storage event trigger preview page.":::
 
@@ -78,9 +78,6 @@ This section shows you how to create a storage event trigger within the Azure Da
 
    In the preceding example, the trigger is configured to fire when a blob path ending in .csv is created in the folder _event-testing_ in the container _sample-data_. The **folderPath** and **fileName** properties capture the location of the new blob. For example, when MoviesDB.csv is added to the path sample-data/event-testing, `@triggerBody().folderPath` has a value of `sample-data/event-testing` and `@triggerBody().fileName` has a value of `moviesDB.csv`. These values are mapped, in the example, to the pipeline parameters `sourceFolder` and `sourceFile`, which can be used throughout the pipeline as `@pipeline().parameters.sourceFolder` and `@pipeline().parameters.sourceFile` respectively.
 
-   > [!NOTE]
-   > If you are creating your pipeline and trigger in [Azure Synapse Analytics](../synapse-analytics/overview-what-is.md), you must use `@trigger().outputs.body.fileName` and `@trigger().outputs.body.folderPath` as parameters. Those two properties capture blob information. Use those properties instead of using `@triggerBody().fileName` and `@triggerBody().folderPath`.
-
 1. Click **Finish** once you are done.
 
 ## JSON schema

articles/data-factory/how-to-send-notifications-to-teams.md

@@ -329,7 +329,7 @@ Before you can send notifications to Teams from your pipelines, you must create
                 "targets": [
                     {
                         "os": "default",
-                        "uri": "@{concat('https://synapse.azure.com/monitoring/pipelineruns/',pipeline().parameters.runId,'?factory=/subscriptions/',pipeline().parameters.subscription,'/resourceGroups/',pipeline().parameters.resourceGroup,'/providers/Microsoft.DataFactory/factories/',pipeline().DataFactory)}"
+                        "uri": "@{concat('https://web.azuresynapse.net/monitoring/pipelineruns/',pipeline().parameters.runId,'?workspace=%2Fsubscriptions%2F',pipeline().parameters.subscription,'%2FresourceGroups%2F',pipeline().parameters.resourceGroup,'%2Fproviders%2FMicrosoft.Synapse%2Fworkspaces%2F',pipeline().DataFactory)}"
                     }
                 ]
             }

articles/data-factory/tutorial-incremental-copy-change-data-capture-feature-portal.md

@@ -45,7 +45,7 @@ In this tutorial, you create a pipeline that performs the following operations:
 If you don't have an Azure subscription, create a [free](https://azure.microsoft.com/free/) account before you begin.
 
 ## Prerequisites
-* **Azure SQL Database Managed Instance**. You use the database as the **source** data store. If you don't have an Azure SQL Database Managed Instance, see the [Create an Azure SQL Database Managed Instance](/azure/azure-sql/managed-instance/instance-create-quickstart) article for steps to create one.
+* **Azure SQL Managed Instance**. You use the database as the **source** data store. If you don't have an Azure SQL Managed Instance, see the [Create an Azure SQL Database Managed Instance](/azure/azure-sql/managed-instance/instance-create-quickstart) article for steps to create one.
 * **Azure Storage account**. You use the blob storage as the **sink** data store. If you don't have an Azure storage account, see the [Create a storage account](../storage/common/storage-account-create.md) article for steps to create one. Create a container named **raw**. 
 
 ### Create a data source table in Azure SQL Database
@@ -76,7 +76,7 @@ If you don't have an Azure subscription, create a [free](https://azure.microsoft
     EXEC sys.sp_cdc_enable_table
     @source_schema = 'dbo',
     @source_name = 'customers', 
-    @role_name = 'null',
+    @role_name = NULL,
     @supports_net_changes = 1
     ```
 5. Insert data into the customers table by running the following command: