Skip to content

Commit 11920ad

Browse files
authored
Merge pull request #301837 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 1c12f41 + 212f9fc commit 11920ad

File tree

7 files changed

+25
-13
lines changed

7 files changed

+25
-13
lines changed

articles/application-gateway/ingress-controller-autoscale-pods.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ spec:
123123
Test your setup by using a load test tool like ApacheBench:
124124
125125
```bash
126-
ab -n10000 http://<applicaiton-gateway-ip-address>/
126+
ab -n10000 http://<application-gateway-ip-address>/
127127
```
128128

129129
## Related content

articles/azure-sql-edge/deploy-onnx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ onnxmltools.utils.save_model(onnx_model, onnx_model_path)
185185
```
186186

187187
> [!NOTE]
188-
> You may need to set the `target_opset` parameter for the skl2onnx.convert_sklearn function if there's a mismatch between ONNX runtime version in SQL Edge and skl2onnx packge. For more information, see the [SQL Edge Release notes](release-notes.md) to get the ONNX runtime version corresponding for the release, and pick the `target_opset` for the ONNX runtime based on the [ONNX backward compatibility matrix](https://github.com/microsoft/onnxruntime/blob/master/docs/Versioning.md#version-matrix).
188+
> You may need to set the `target_opset` parameter for the skl2onnx.convert_sklearn function if there's a mismatch between ONNX runtime version in SQL Edge and skl2onnx package. For more information, see the [SQL Edge Release notes](release-notes.md) to get the ONNX runtime version corresponding for the release, and pick the `target_opset` for the ONNX runtime based on the [ONNX backward compatibility matrix](https://github.com/microsoft/onnxruntime/blob/master/docs/Versioning.md#version-matrix).
189189
190190
## Test the ONNX model
191191

articles/communication-services/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ You can explore and review many [support options and plans](https://azure.micros
2121

2222
## Post a question to Microsoft Q&A
2323

24-
For quick and reliable answers to product or technical questions you might have about Azure Communication Services, engage with us on [Microsoft Q&A](/answers/products/azure). You can get answers from:
24+
For quick and reliable answers to product or technical questions you might have about Azure Communication Services, engage with us on [Microsoft Q&A](/answers/tags/128/azure-communication-services). You can get answers from:
2525

2626
- Microsoft engineers
2727
- Azure Most Valuable Professionals (MVPs)

articles/private-link/network-security-perimeter-concepts.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ A network security perimeter-aware private link resource is a PaaS resource that
9898
| [Key Vault](/azure/key-vault/general/network-security#network-security-perimeter-preview) | Microsoft.KeyVault/vaults | - |
9999
| [SQL DB](/azure/azure-sql/database/network-security-perimeter) | Microsoft.Sql/servers | - |
100100
| [Storage](/azure/storage/common/storage-network-security#network-secuirty-perimeter-preview) | Microsoft.Storage/storageAccounts | - |
101+
| [Azure OpenAI service](/azure/ai-services/openai/how-to/network-security-perimeter) | Microsoft.CognitiveServices | - |
101102

102103
> [!NOTE]
103104
> Refer to the respective private link resource documentation for information on currently unsupported scenarios.

articles/spring-apps/basic-standard/concept-manage-monitor-app-spring-boot-actuator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ In the Enterprise plan, there are two ways to secure the access:
6969

7070
- You can disable the public endpoint of apps and configure a routing rule in VMware Spring Cloud Gateway to disable actuator access from the public. For more information, see [Configure VMware Spring Cloud Gateway](../enterprise/how-to-configure-enterprise-spring-cloud-gateway.md).
7171

72-
- You can configure the actuator to listen on a different HTTP port from the main application. In a standalone application, the actuator HTTP port defaults to the same as the main HTTP port. For the application to listen on a different port, set the `management.server.port` property. The Application Live View is unable to automatically detect this port change, so you also need to configure the property on an Azure Spring Apps deployment. Then, the actuator isn't publically accessible, but the Application Live View can read from the actuator endpoint via another port. For more information, see [Use Application Live View with the Azure Spring Apps Enterprise plan](../enterprise/how-to-use-application-live-view.md).
72+
- You can configure the actuator to listen on a different HTTP port from the main application. In a standalone application, the actuator HTTP port defaults to the same as the main HTTP port. For the application to listen on a different port, set the `management.server.port` property. The Application Live View is unable to automatically detect this port change, so you also need to configure the property on an Azure Spring Apps deployment. Then, the actuator isn't publicly accessible, but the Application Live View can read from the actuator endpoint via another port. For more information, see [Use Application Live View with the Azure Spring Apps Enterprise plan](../enterprise/how-to-use-application-live-view.md).
7373

7474
## Next steps
7575

articles/spring-apps/enterprise/how-to-use-accelerator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ Use the following steps to view the list of App Accelerators in an Azure Spring
518518
519519
### Troubleshoot App Accelerator issues
520520

521-
If you try to open App Accelerator for a service instance that hasn't enabled App Accelerator or exposed a public endpoint, you see the following error message: `Application Accelerator of Spring Apps <instance-name> is not enabled or publically accessible`.
521+
If you try to open App Accelerator for a service instance that hasn't enabled App Accelerator or exposed a public endpoint, you see the following error message: `Application Accelerator of Spring Apps <instance-name> is not enabled or publicly accessible`.
522522

523523
To enable App Accelerator and expose public endpoints, use the following steps. For more information, see the [Manage App Accelerator in an existing Enterprise plan instance](#manage-app-accelerator-in-an-existing-enterprise-plan-instance) section.
524524

articles/trusted-signing/how-to-signing-integrations.md

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,25 @@ Each authentication method can be disabled individually to avoid unnecessary att
165165

166166
For example, when authenticating with [EnvironmentCredential](/dotnet/api/azure.identity.environmentcredential) specifically, disable the other credentials with the following inputs:
167167

168-
ExcludeEnvironmentCredential: false
169-
ExcludeManagedIdentityCredential: true
170-
ExcludeSharedTokenCacheCredential: true
171-
ExcludeVisualStudioCredential: true
172-
ExcludeVisualStudioCodeCredential: true
173-
ExcludeAzureCliCredential: true
174-
ExcludeAzurePowershellCredential: true
175-
ExcludeInteractiveBrowserCredential: true
168+
```json
169+
{
170+
"Endpoint": "<Trusted Signing account endpoint>",
171+
"CodeSigningAccountName": "<Trusted Signing account name>",
172+
"CertificateProfileName": "<Certificate profile name>",
173+
"CorrelationId": "<Optional CorrelationId value>",
174+
"ExcludeCredentials": [
175+
"ManagedIdentityCredential",
176+
"WorkloadIdentityCredential",
177+
"SharedTokenCacheCredential",
178+
"VisualStudioCredential",
179+
"VisualStudioCodeCredential",
180+
"AzureCliCredential",
181+
"AzurePowerShellCredential",
182+
"AzureDeveloperCliCredential",
183+
"InteractiveBrowserCredential"
184+
]
185+
}
186+
```
176187

177188
Similarly, if using for example an [AzureCliCredential](/dotnet/api/azure.identity.azureclicredential) , then we want to skip over attempting to authenticate with the several methods that come before it in order.
178189

0 commit comments

Comments
 (0)