Skip to content

Commit c776a87

Browse files
authored
Merge pull request #299139 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents d878dd7 + 2900024 commit c776a87

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

articles/logic-apps/create-standard-workflows-hybrid-deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ After you meet the prerequisites, create your Standard logic app for hybrid depl
8181
| **Subscription** | Yes | <*Azure-subscription-name*> | Your Azure subscription name. <br><br>This example uses **Pay-As-You-Go**. |
8282
| **Resource Group** | Yes | <*Azure-resource-group-name*> | The [Azure resource group](../azure-resource-manager/management/overview.md#terminology) where you create your hybrid app and related resources. This name must be unique across regions and can contain only letters, numbers, hyphens (**-**), underscores (**_**), parentheses (**()**), and periods (**.**). <br><br>This example creates a resource group named **Hybrid-RG**. |
8383
| **Logic App name** | Yes | <*logic-app-name*> | Your logic app name, which must be unique across regions and can contain only lowercase letters, numbers, or hyphens (**-**). <br><br>This example uses **my-logic-app-hybrid**. |
84-
| **Region** | Yes | <*Azure-region*> | An Azure region that is [supported for Azure container apps on Azure Arc-enabled AKS](../container-apps/azure-arc-overview.md#public-preview-limitations). <br><br>This example uses **East US**. |
84+
| **Region** | Yes | <*Azure-region*> | An Azure region that is [supported for Azure Container Apps on Azure Arc-enabled AKS](../container-apps/azure-arc-overview.md#public-preview-limitations). <br><br>This example uses **East US**. |
8585
| **Container App Connected Environment** | Yes | <*connected-environment-name*> | The Arc-enabled Kubernetes cluster that you created as the deployment environment for your logic app. For more information, see [Tutorial: Enable Azure Container Apps on Azure Arc-enabled Kubernetes](../container-apps/azure-arc-enable-cluster.md). |
8686
| **Configure storage settings** | Yes | Enabled or disabled | Continues to the **Storage** tab on the **Create Logic App (Hybrid)** page. |
8787

@@ -168,7 +168,7 @@ After you meet the prerequisites, but before you create your Standard logic app
168168

169169
This example uses **Hybrid-RG**.
170170

171-
1. From the location list, select an Azure region that is [supported for Azure container apps on Azure Arc-enabled AKS](../container-apps/azure-arc-overview.md#public-preview-limitations).
171+
1. From the location list, select an Azure region that is [supported for Azure Container Apps on Azure Arc-enabled AKS](../container-apps/azure-arc-overview.md#public-preview-limitations).
172172

173173
This example uses **East US**.
174174

articles/logic-apps/set-up-standard-workflows-hybrid-deployment-requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Your Kubernetes cluster requires inbound and outbound connectivity with the [SQL
145145
| **SUBSCRIPTION** | Yes | <*Azure-subscription-ID*> | The ID for your Azure subscription |
146146
| **AKS_CLUSTER_GROUP_NAME** | Yes | <*aks-cluster-resource-group-name*> | The name for the Azure resource group to use with your Kubernetes cluster. This name must be unique across regions and can contain only letters, numbers, hyphens (**-**), underscores (**_**), parentheses (**()**), and periods (**.**). <br><br>This example uses **Hybrid-RG**. |
147147
| **AKS_NAME** | Yes | <*aks-cluster-name*> | The name for your Kubernetes cluster. |
148-
| **LOCATION** | Yes | <*Azure-region*> | An Azure region that [supports Azure container apps on Azure Arc-enabled Kubernetes](../container-apps/azure-arc-overview.md#public-preview-limitations). <br><br>This example uses **eastus**. |
148+
| **LOCATION** | Yes | <*Azure-region*> | An Azure region that [supports Azure Container Apps on Azure Arc-enabled Kubernetes](../container-apps/azure-arc-overview.md#public-preview-limitations). <br><br>This example uses **eastus**. |
149149

150150
1. Run the following commands either by using the Bash environment in [Azure Cloud Shell](/azure/cloud-shell/overview) or locally using [Azure CLI installed on your computer](/cli/azure/install-azure-cli):
151151

articles/security/develop/threat-modeling-tool-configuration-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ Note that Request Validation feature is not supported, and is not part of MVC6 p
191191
| **Applicable Technologies** | Generic |
192192
| **Attributes** | N/A |
193193
| **References** | N/A |
194-
| **Steps** | <p>Developers using standard JavaScript libraries like JQuery must use approved versions of common JavaScript libraries that do not contain known security flaws. A good practice is to use the most latest version of the libraries, since they contain security fixes for known vulnerabilities in their older versions.</p><p>If the most recent release cannot be used due to compatibility reasons, the below minimum versions should be used.</p><p>Acceptable minimum versions:</p><ul><li>**JQuery**<ul><li>JQuery 1.7.1</li><li>JQueryUI 1.10.0</li><li>JQuery Validate 1.9</li><li>JQuery Mobile 1.0.1</li><li>JQuery Cycle 2.99</li><li>JQuery DataTables 1.9.0</li></ul></li><li>**Ajax Control Toolkit**<ul><li>Ajax Control Toolkit 40412</li></ul></li><li>**ASP.NET Web Forms and Ajax**<ul><li>ASP.NET Web Forms and Ajax 4</li><li>ASP.NET Ajax 3.5</li></ul></li><li>**ASP.NET MVC**<ul><li>ASP.NET MVC 3.0</li></ul></li></ul><p>Never load any JavaScript library from external sites such as public CDNs</p>|
194+
| **Steps** | <p>Developers using standard JavaScript libraries like jQuery must use approved versions of common JavaScript libraries that do not contain known security flaws. A good practice is to use the most latest version of the libraries, since they contain security fixes for known vulnerabilities in their older versions.</p><p>If the most recent release cannot be used due to compatibility reasons, the below minimum versions should be used.</p><p>Acceptable minimum versions:</p><ul><li>**jQuery**<ul><li>jQuery 1.7.1</li><li>jQueryUI 1.10.0</li><li>jQuery Validate 1.9</li><li>jQuery Mobile 1.0.1</li><li>jQuery Cycle 2.99</li><li>jQuery DataTables 1.9.0</li></ul></li><li>**Ajax Control Toolkit**<ul><li>Ajax Control Toolkit 40412</li></ul></li><li>**ASP.NET Web Forms and Ajax**<ul><li>ASP.NET Web Forms and Ajax 4</li><li>ASP.NET Ajax 3.5</li></ul></li><li>**ASP.NET MVC**<ul><li>ASP.NET MVC 3.0</li></ul></li></ul><p>Never load any JavaScript library from external sites such as public CDNs</p>|
195195

196196
## <a id="mime-sniff"></a>Disable automatic MIME sniffing
197197

articles/synapse-analytics/troubleshoot/troubleshoot-synapse-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ wss://{workspace}.dev.azuresynapse.net/jupyterApi/versions/1/sparkPools/{spark-p
135135

136136
When setting up WebSocket connection, Synapse Studio will include an access token (Microsoft Entra JWT bearer token) in the Sec-WebSocket-Protocol header of the WebSocket request.
137137

138-
Sometimes, WebSocket request might be blocked, or JWT token in the request header might be redacted in your network environment. This will cause Synapse Notebook unable to establish the connection to our server and run your notebook.
138+
Sometimes, WebSocket request might be blocked, or JWT in the request header might be redacted in your network environment. This will cause Synapse Notebook unable to establish the connection to our server and run your notebook.
139139

140140
### Action:
141141

0 commit comments

Comments
 (0)