Skip to content

Commit 54182b3

Browse files
authored
Merge pull request #190693 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 5b0a599 + e60f911 commit 54182b3

File tree

27 files changed

+40
-38
lines changed

27 files changed

+40
-38
lines changed

articles/active-directory-b2c/protocols-overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/oauth2/v2.0/authorize
3434
https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/oauth2/v2.0/token
3535
```
3636

37+
If you're using a [custom domain](custom-domain.md), replace `{tenant}.b2clogin.com` with the custom domain, such as `contoso.com`, in the endpoints.
38+
3739
In nearly all OAuth and OpenID Connect flows, four parties are involved in the exchange:
3840

3941

articles/active-directory/develop/msal-net-web-browsers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ MSAL.NET is able to respond with an HTTP message when a token is received or in
110110
```csharp
111111
var options = new SystemWebViewOptions()
112112
{
113-
HtmlMessageError = "<p> An error occured: {0}. Details {1}</p>",
113+
HtmlMessageError = "<p> An error occurred: {0}. Details {1}</p>",
114114
BrowserRedirectSuccess = new Uri("https://www.microsoft.com");
115115
}
116116

articles/applied-ai-services/immersive-reader/includes/quickstarts/immersive-reader-client-library-swift.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class LaunchViewController: UIViewController {
205205
})
206206
}
207207
}, onFailure: { error in
208-
print("an error occured: \(error)")
208+
print("an error occurred: \(error)")
209209
})
210210
}
211211

@@ -569,4 +569,4 @@ When you click on the **Immersive Reader** button, you'll see the Immersive Read
569569
## Next steps
570570

571571
> [!div class="nextstepaction"]
572-
> [Create a resource and configure AAD](../../how-to-create-immersive-reader.md)
572+
> [Create a resource and configure AAD](../../how-to-create-immersive-reader.md)

articles/azure-arc/kubernetes/custom-locations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ If you are logged into Azure CLI using a service principal, to enable this featu
128128
| `--resource-group, --g` | Resource group of the custom location |
129129
| `--namespace` | Namespace in the cluster bound to the custom location being created |
130130
| `--host-resource-id` | Azure Resource Manager identifier of the Azure Arc-enabled Kubernetes cluster (connected cluster) |
131-
| `--cluster-extension-ids` | Azure Resource Manager identifiers of the cluster extension instances installed on the connected cluster. Provide a space-seperated list of the cluster extension IDs |
131+
| `--cluster-extension-ids` | Azure Resource Manager identifiers of the cluster extension instances installed on the connected cluster. Provide a space-separated list of the cluster extension IDs |
132132
133133
**Optional parameters**
134134
@@ -189,7 +189,7 @@ az customlocation update -n <customLocationName> -g <resourceGroupName> --namesp
189189

190190
| Parameter name | Description |
191191
|--------------|------------|
192-
| `--cluster-extension-ids` | Associate new cluster extensions to this custom location by providing Azure Resource Manager identifiers of the cluster extension instances installed on the connected cluster. Provide a space-seperated list of the cluster extension IDs |
192+
| `--cluster-extension-ids` | Associate new cluster extensions to this custom location by providing Azure Resource Manager identifiers of the cluster extension instances installed on the connected cluster. Provide a space-separated list of the cluster extension IDs |
193193
| `--tags` | Add new tags in addition to existing tags. Space-separated list of tags: key[=value] [key[=value] ...]. |
194194

195195
## Patch a custom location
@@ -211,7 +211,7 @@ az customlocation patch -n <customLocationName> -g <resourceGroupName> --namespa
211211

212212
| Parameter name | Description |
213213
|--------------|------------|
214-
| `--cluster-extension-ids` | Associate new cluster extensions to this custom location by providing Azure Resource Manager identifiers of the cluster extension instances installed on the connected cluster. Provide a space-seperated list of the cluster extension IDs |
214+
| `--cluster-extension-ids` | Associate new cluster extensions to this custom location by providing Azure Resource Manager identifiers of the cluster extension instances installed on the connected cluster. Provide a space-separated list of the cluster extension IDs |
215215
| `--tags` | Add new tags in addition to existing tags. Space-separated list of tags: key[=value] [key[=value] ...]. |
216216

217217
## Delete a custom location

articles/azure-monitor/essentials/metrics-supported.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ This latest update adds a new column and reorders the metrics to be alphabetical
496496
|connectedclients7|Yes|Connected Clients (Shard 7)|Count|Maximum|The number of client connections to the cache. For more details, see https://aka.ms/redis/metrics.|No Dimensions|
497497
|connectedclients8|Yes|Connected Clients (Shard 8)|Count|Maximum|The number of client connections to the cache. For more details, see https://aka.ms/redis/metrics.|No Dimensions|
498498
|connectedclients9|Yes|Connected Clients (Shard 9)|Count|Maximum|The number of client connections to the cache. For more details, see https://aka.ms/redis/metrics.|No Dimensions|
499-
|errors|Yes|Errors|Count|Maximum|The number errors that occured on the cache. For more details, see https://aka.ms/redis/metrics.|ShardId, ErrorType|
499+
|errors|Yes|Errors|Count|Maximum|The number errors that occurred on the cache. For more details, see https://aka.ms/redis/metrics.|ShardId, ErrorType|
500500
|evictedkeys|Yes|Evicted Keys|Count|Total|The number of items evicted from the cache. For more details, see https://aka.ms/redis/metrics.|ShardId|
501501
|evictedkeys0|Yes|Evicted Keys (Shard 0)|Count|Total|The number of items evicted from the cache. For more details, see https://aka.ms/redis/metrics.|No Dimensions|
502502
|evictedkeys1|Yes|Evicted Keys (Shard 1)|Count|Total|The number of items evicted from the cache. For more details, see https://aka.ms/redis/metrics.|No Dimensions|

articles/batch/batch-js-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ containerList.forEach(function (val, index) {
309309

310310
const task = batchClient.task.add(jobId, taskConfig, function (error, result) {
311311
if (error !== null) {
312-
console.log("Error occured while creating task for container " + containerName + ". Details : " + error.response);
312+
console.log("Error occurred while creating task for container " + containerName + ". Details : " + error.response);
313313
}
314314
else {
315315
console.log("Task for container : " + containerName + " submitted successfully");

articles/cosmos-db/cassandra/cassandra-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ curl https://cacert.omniroot.com/bc2025.crt > bc2025.crt
262262
keytool -importcert -alias bc2025ca -file bc2025.crt
263263

264264
# Install the Cassandra libraries in order to get CQLSH:
265-
echo "deb http://www.apache.org/dist/cassandra/debian 311x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list
265+
echo "deb https://downloads.apache.org/cassandra/debian 311x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list
266266
curl https://downloads.apache.org/cassandra/KEYS | sudo apt-key add -
267267
sudo apt-get update
268268
sudo apt-get install cassandra

articles/defender-for-cloud/alerts-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ Microsoft Defender for Containers provides security alerts on the cluster level
369369
| **Potential crypto coin miner started (Preview)**<br>(K8S.NODE_CryptoCoinMinerExecution) | Analysis of processes running within a container detected a process being started in a way normally associated with digital currency mining. | Execution | Medium |
370370
| **Suspicious password access (Preview)**<br>(K8S.NODE_SuspectPasswordFileAccess) | Analysis of processes running within a container detected suspicious access to encrypted user passwords. | Persistence | Informational |
371371
| **Suspicious use of DNS over HTTPS (Preview)**<br>(K8S.NODE_SuspiciousDNSOverHttps) | Analysis of processes running within a container indicates the use of a DNS call over HTTPS in an uncommon fashion. This technique is used by attackers to hide calls out to suspect or malicious sites. | DefenseEvasion, Exfiltration | Medium |
372-
| **A possible connection to malicious location has been detected. (Preview)**<br>(K8S.NODE_ThreatIntelCommandLineSuspectDomain) | Analysis of processes running within a container detected a connection to a location that has been reported to be malicious or unusual. This is an indicator that a compromise may have occured. | InitialAccess | Medium |
372+
| **A possible connection to malicious location has been detected. (Preview)**<br>(K8S.NODE_ThreatIntelCommandLineSuspectDomain) | Analysis of processes running within a container detected a connection to a location that has been reported to be malicious or unusual. This is an indicator that a compromise may have occurred. | InitialAccess | Medium |
373373
| | | | |
374374

375375
<sup><a name="footnote1"></a>1</sup>: **Limitations on GKE clusters**: GKE uses a Kuberenetes audit policy that doesn't support all alert types. As a result, this security alert, which is based on Kubernetes audit events, are not supported for GKE clusters.

articles/industrial-iot/reference-command-line-arguments.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,19 +262,19 @@ There are a couple of environment variables, which can be used to control the ap
262262
--tb, --addtrustedcertbase64=VALUE
263263
adds the certificate to the applications trusted
264264
cert store passed in as base64 string (multiple
265-
comma-seperated strings supported)
265+
comma-separated strings supported)
266266
--tf, --addtrustedcertfile=VALUE
267267
adds the certificate file(s) to the applications
268268
trusted cert store passed in as base64 string (
269-
multiple comma-seperated filenames supported)
269+
multiple comma-separated filenames supported)
270270
--ib, --addissuercertbase64=VALUE
271271
adds the specified issuer certificate to the
272272
applications trusted issuer cert store passed in
273-
as base64 string (multiple comma-seperated strings supported)
273+
as base64 string (multiple comma-separated strings supported)
274274
--if, --addissuercertfile=VALUE
275275
adds the specified issuer certificate file(s) to
276276
the applications trusted issuer cert store (
277-
multiple comma-seperated filenames supported)
277+
multiple comma-separated filenames supported)
278278
--rb, --updatecrlbase64=VALUE
279279
update the CRL passed in as base64 string to the
280280
corresponding cert store (trusted or trusted
@@ -285,7 +285,7 @@ There are a couple of environment variables, which can be used to control the ap
285285
issuer)
286286
--rc, --removecert=VALUE
287287
remove cert(s) with the given thumbprint(s) (
288-
multiple comma-seperated thumbprints supported)
288+
multiple comma-separated thumbprints supported)
289289
--dt, --devicecertstoretype=VALUE
290290
the iothub device cert store type.
291291
(allowed values: Directory, X509Store)
@@ -395,4 +395,4 @@ Further resources can be found in the GitHub repositories:
395395
> [OPC Publisher GitHub repository](https://github.com/Azure/Industrial-IoT)
396396
397397
> [!div class="nextstepaction"]
398-
> [IIoT Platform GitHub repository](https://github.com/Azure/iot-edge-opc-publisher)
398+
> [IIoT Platform GitHub repository](https://github.com/Azure/iot-edge-opc-publisher)

articles/machine-learning/how-to-secure-training-vnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ For steps on how to create a compute instance deployed in a virtual network, see
262262

263263
When you enable **No public IP**, your compute instance doesn't use a public IP for communication with any dependencies. Instead, it communicates solely within the virtual network using Azure Private Link ecosystem and service/private endpoints, eliminating the need for a public IP entirely. No public IP removes access and discoverability of compute instance node from the internet thus eliminating a significant threat vector. Compute instances will also do packet filtering to reject any traffic from outside virtual network. **No public IP** instances are dependent on [Azure Private Link](how-to-configure-private-link.md) for Azure Machine Learning workspace.
264264

265-
For **outbound connections** to work, you need to set up an egress firewall such as Azure firewall with user defined routes. For instance, you can use a firewall set up with [invound/outbound configuration](how-to-access-azureml-behind-firewall.md) and route traffic there by defining a route table on the subnet in which the compute instance is deployed. The route table entry can set up the next hop of the private IP address of the firewall with the address prefix of 0.0.0.0/0.
265+
For **outbound connections** to work, you need to set up an egress firewall such as Azure firewall with user defined routes. For instance, you can use a firewall set up with [inbound/outbound configuration](how-to-access-azureml-behind-firewall.md) and route traffic there by defining a route table on the subnet in which the compute instance is deployed. The route table entry can set up the next hop of the private IP address of the firewall with the address prefix of 0.0.0.0/0.
266266

267267
A compute instance with **No public IP** enabled has **no inbound communication requirements** from public internet. Specifically, neither inbound NSG rule (`BatchNodeManagement`, `AzureMachineLearning`) is required. You still need to allow inbound from source of **VirtualNetwork**, any port source, destination of **VirtualNetwork**, and destination port of **29876, 29877, 44224**.
268268

0 commit comments

Comments
 (0)