Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pl-tut-cosmos

Author: halkazwini

articles/azure-vmware/deploy-disaster-recovery-using-jetstream.md

@@ -121,7 +121,7 @@ For full details, refer to the article: [Disaster Recovery with Azure NetApp Fil
 
 - (Optional) Azure NetApp Files volume(s) are created and attached to the Azure VMware Solution private cloud for recovery or failover of protected VMs to Azure NetApp Files backed datastores.  
 
-  - [Integrate Azure NetApp Files with Azure VMware Solution](https://docs.microsoft.com/azure/azure-vmware/netapp-files-with-azure-vmware-solution)
+  - [Attach Azure NetApp Files datastores to Azure VMware Solution hosts (Preview)](attach-azure-netapp-files-to-azure-vmware-solution-hosts.md)
   - [Disaster Recovery with Azure NetApp Files, JetStream DR and AVS (Azure VMware Solution)](https://www.jetstreamsoft.com/portal/jetstream-knowledge-base/disaster-recovery-with-azure-netapp-files-jetstream-dr-and-avs-azure-vmware-solution/)  
 
 ### Scenario 2: Azure VMware Solution to Azure VMware Solution DR
@@ -141,9 +141,10 @@ For full details, refer to the article: [Disaster Recovery with Azure NetApp Fil
 
 - A DNS server configured on both the primary and DR sites to resolve the IP addresses of Azure VMware Solution vCenter Server, Azure VMware Solution ESXi hosts, Azure Storage account, and the JetStream Marketplace service for the JetStream virtual appliances.
 - (Optional) Azure NetApp Files volume(s) are created and attached to the Azure VMware Solution private cloud for recovery or failover of protected VMs to Azure NetApp Files backed datastores.
-  - [Integrate Azure NetApp Files with Azure VMware Solution](https://docs.microsoft.com/azure/azure-vmware/netapp-files-with-azure-vmware-solution) 
-  - [Disaster Recovery with Azure NetApp Files, JetStream DR and AVS (Azure VMware Solution)](https://docs.microsoft.com/azure/azure-vmware/netapp-files-with-azure-vmware-solution)   
 
+  - [Attach Azure NetApp Files datastores to Azure VMware Solution hosts (Preview)](attach-azure-netapp-files-to-azure-vmware-solution-hosts.md)
+  - [Disaster Recovery with Azure NetApp Files, JetStream DR and AVS (Azure VMware Solution)](https://www.jetstreamsoft.com/portal/jetstream-knowledge-base/disaster-recovery-with-azure-netapp-files-jetstream-dr-and-avs-azure-vmware-solution/)
+  
 For more on-premises JetStream DR prerequisites, see the [JetStream Pre-Installation Guide](https://www.jetstreamsoft.com/portal/jetstream-knowledge-base/pre-installation-guidelines/).
 
 

articles/data-factory/ci-cd-github-troubleshoot-guide.md

@@ -156,11 +156,11 @@ Until recently, the it was only possible to publish a pipeline for deployments b
 
 CI/CD process has been enhanced. The **Automated** publish feature takes, validates, and exports all ARM template features from the UI. It makes the logic consumable via a publicly available npm package [@microsoft/azure-data-factory-utilities](https://www.npmjs.com/package/@microsoft/azure-data-factory-utilities). This method allows you to programmatically trigger these actions instead of having to go to the UI and click a button. This method gives  your CI/CD pipelines a **true** continuous integration experience. Follow [CI/CD Publishing Improvements](./continuous-integration-delivery-improvements.md) for details. 
 
-###  Cannot publish because of 4-MB ARM template limit  
+###  Cannot publish because of 4 MB ARM template limit  
 
 #### Issue
 
-You can't  deploy because you hit Azure Resource Manager limit of 4-MB total template size. You need a solution to deploy after crossing the limit. 
+You can't  deploy because you hit Azure Resource Manager limit of 4 MB total template size. You need a solution to deploy after crossing the limit. 
 
 #### Cause
 
@@ -178,7 +178,7 @@ While publishing ADF resources, the azure pipeline triggers twice or more instea
 
 #### Cause
 
-Azure DevOps has the 20 MB REST API limit. When the ARM template exceeds this size, ADF internally splits the template file into multiple files with linked templates to solve this issue. As a side effect, this split could result in customer's triggers being run more than once.
+Azure DevOps has the 20-MB REST API limit. When the ARM template exceeds this size, ADF internally splits the template file into multiple files with linked templates to solve this issue. As a side effect, this split could result in customer's triggers being run more than once.
 
 #### Resolution
 
@@ -343,6 +343,19 @@ On publish, ADF fetches every file inside each folder in the collaboration branc
 #### Resolution
 Delete the PartialTemplates folder and republish. You can delete the temporary files in that folder as well.
 
+ 
+#### Error code: InvalidTemplate
+	
+#### Issue
+Message says *Unable to parse expression.* The expression passed in the dynamic content of an activity isn't being processed correctly because of a syntax error.
+
+#### Cause
+Dynamic content is not written as per expression language requirements. 
+
+#### Resolution 
+* For debug run, check expressions in pipeline within current git branch.
+* For Triggered run, check expressions in pipeline within *Live* mode .
+ 
 ## Next steps
 
 For more help with troubleshooting, try the following resources: