Skip to content

Commit 746499f

Browse files
authored
Merge pull request #236789 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 8f82d23 + 425600c commit 746499f

9 files changed

+19
-29
lines changed

articles/active-directory/authentication/concept-authentication-strengths.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,6 @@ An authentication strength Conditional Access policy works together with [MFA tr
203203

204204
- **Using 'Require one of the selected controls' with 'require authentication strength' control** - After you select authentication strengths grant control and additional controls, all the selected controls must be satisfied in order to gain access to the resource. Using **Require one of the selected controls** isn't applicable, and will default to requiring all the controls in the policy.
205205

206-
- **Authentication loop** - When the user is required to use Microsoft Authenticator (Phone Sign-in) but the user is not registered for this method, they will be given instructions on how to set up the Microsoft Authenticator, that does not include how to enable Passwordless sign-in. As a result, the user can get into an authentication loop. To avoid this issue, make sure the user is registered for the method before the Conditional Access policy is enforced. Phone Sign-in can be registered using the steps outlined here: [Add your work or school account to the Microsoft Authenticator app ("Sign in with your credentials")](https://support.microsoft.com/en-us/account-billing/add-your-work-or-school-account-to-the-microsoft-authenticator-app-43a73ab5-b4e8-446d-9e54-2a4cb8e4e93c)
207-
208206

209207
## Limitations
210208

articles/active-directory/authentication/howto-authentication-use-email-signin.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ One of the user attributes that's automatically synchronized by Azure AD Connect
125125

126126
Email as an alternate login ID applies to [Azure AD B2B collaboration](../external-identities/what-is-b2b.md) under a "bring your own sign-in identifiers" model. When email as an alternate login ID is enabled in the home tenant, Azure AD users can perform guest sign in with non-UPN email on the resource tenant endpoint. No action is required from the resource tenant to enable this functionality.
127127

128+
> [!NOTE]
129+
> When an alternate login ID is used on a resource tenant endpoint that does not have the functionality enabled, the sign-in process will work seamlessly, but SSO will be interrupted.
130+
128131
## Enable user sign-in with an email address
129132

130133
> [!NOTE]

articles/active-directory/authentication/howto-password-ban-bad-on-premises-deploy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ To install the Azure AD Password Protection proxy service, complete the followin
249249

250250
Registration of the Azure AD Password Protection proxy service is necessary only once in the lifetime of the service. After that, the Azure AD Password Protection proxy service will automatically perform any other necessary maintenance.
251251

252-
1. To make sure that the changes have taken effect, run `Test-AzureADPasswordProtectionDCAgentHealth -TestAll`. For help resolving errors, see [Troubleshoot: On-premises Azure AD Password Protection](howto-password-ban-bad-on-premises-troubleshoot.md).
252+
1. To make sure that the changes have taken effect, run `Test-AzureADPasswordProtectionProxyHealth -TestAll`. For help resolving errors, see [Troubleshoot: On-premises Azure AD Password Protection](howto-password-ban-bad-on-premises-troubleshoot.md).
253253

254254
1. Now register the on-premises Active Directory forest with the necessary credentials to communicate with Azure by using the `Register-AzureADPasswordProtectionForest` PowerShell cmdlet.
255255

@@ -304,7 +304,7 @@ To install the Azure AD Password Protection proxy service, complete the followin
304304
305305
For `Register-AzureADPasswordProtectionForest` to succeed, at least one DC running Windows Server 2012 or later must be available in the Azure AD Password Protection proxy server's domain. The Azure AD Password Protection DC agent software doesn't have to be installed on any domain controllers prior to this step.
306306

307-
1. To make sure that the changes have taken effect, run `Test-AzureADPasswordProtectionDCAgentHealth -TestAll`. For help resolving errors, see [Troubleshoot: On-premises Azure AD Password Protection](howto-password-ban-bad-on-premises-troubleshoot.md).
307+
1. To make sure that the changes have taken effect, run `Test-AzureADPasswordProtectionProxyHealth -TestAll`. For help resolving errors, see [Troubleshoot: On-premises Azure AD Password Protection](howto-password-ban-bad-on-premises-troubleshoot.md).
308308

309309
### Configure the proxy service to communicate through an HTTP proxy
310310

articles/aks/configure-kube-proxy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ The full `kube-proxy` configuration structure can be found in the [AKS Cluster S
6969
- `mode` - can be set to `IPTABLES` or `IPVS`. Defaults to `IPTABLES`.
7070
- `ipvsConfig` - if `mode` is `IPVS`, this object contains IPVS-specific configuration properties.
7171
- `scheduler` - which connection scheduler to utilize. Supported values:
72-
- `LeastConnections` - sends connections to the backend pod with the fewest connections
72+
- `LeastConnection` - sends connections to the backend pod with the fewest connections
7373
- `RoundRobin` - distributes connections evenly between backend pods
7474
- `tcpFinTimeoutSeconds` - the value used for timeout after a FIN has been received in a TCP session
7575
- `tcpTimeoutSeconds` - the value used for timeout length for idle TCP sessions
7676
- `udpTimeoutSeconds` - the value used for timeout length for idle UDP sessions
7777

7878
> [!NOTE]
79-
> IPVS load balancing operates in each node independently and is still only aware of connections flowing through the local node. This means that while `LeastConnections` results in more even load under higher number of connections, when low numbers of connections (# connects < 2 * node count) occur traffic may still be relatively unbalanced.
79+
> IPVS load balancing operates in each node independently and is still only aware of connections flowing through the local node. This means that while `LeastConnection` results in more even load under higher number of connections, when low numbers of connections (# connects < 2 * node count) occur traffic may still be relatively unbalanced.
8080
8181
## Utilize `kube-proxy` configuration in a new or existing AKS cluster using Azure CLI
8282

articles/azure-functions/durable/durable-functions-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ public static async Task Run(
518518
if (jobStatus == "Completed")
519519
{
520520
// Perform an action when a condition is met.
521-
await context.CallActivityAsync("SendAlert", machineId);
521+
await context.CallActivityAsync("SendAlert", jobId);
522522
break;
523523
}
524524

@@ -547,7 +547,7 @@ public static async Task Run(
547547
if (jobStatus == "Completed")
548548
{
549549
// Perform an action when a condition is met.
550-
await context.CallActivityAsync("SendAlert", machineId);
550+
await context.CallActivityAsync("SendAlert", jobId);
551551
break;
552552
}
553553

@@ -575,7 +575,7 @@ module.exports = df.orchestrator(function*(context) {
575575
const jobStatus = yield context.df.callActivity("GetJobStatus", jobId);
576576
if (jobStatus === "Completed") {
577577
// Perform an action when a condition is met.
578-
yield context.df.callActivity("SendAlert", machineId);
578+
yield context.df.callActivity("SendAlert", jobId);
579579
break;
580580
}
581581

articles/azure-functions/functions-machine-learning-tensorflow.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,7 @@ Navigate to the *start* folder and run the following commands to create and acti
5959
6060
```bash
6161
cd start
62-
```
63-
64-
```bash
6562
python -m venv .venv
66-
```
67-
68-
```bash
6963
source .venv/bin/activate
7064
```
7165

@@ -79,27 +73,15 @@ sudo apt-get install python3-venv
7973

8074
```powershell
8175
cd start
82-
```
83-
84-
```powershell
8576
py -3.7 -m venv .venv
86-
```
87-
88-
```powershell
8977
.venv\scripts\activate
9078
```
9179

9280
# [Cmd](#tab/cmd)
9381

9482
```cmd
9583
cd start
96-
```
97-
98-
```cmd
9984
py -3.7 -m venv .venv
100-
```
101-
102-
```cmd
10385
.venv\scripts\activate
10486
```
10587

articles/azure-functions/ip-addresses.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ nslookup <APP_NAME>.azurewebsites.net
4949

5050
Each function app has a set of available outbound IP addresses. Any outbound connection from a function, such as to a back-end database, uses one of the available outbound IP addresses as the origin IP address. You can't know beforehand which IP address a given connection will use. For this reason, your back-end service must open its firewall to all of the function app's outbound IP addresses.
5151

52+
> [!TIP]
53+
> For some platform-level features such as [Key Vault references](../app-service/app-service-key-vault-references.md), the origin IP might not be one of the outbound IPs, and you should not configure the target resource to rely on these specific addresses. It is recommended that the app instead use a virtual network integration, as the platform will route traffic to the target resource through that network.
54+
5255
To find the outbound IP addresses available to a function app:
5356

5457
# [Azure portal](#tab/portal)

articles/storage/common/storage-solution-large-dataset-low-network.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following table summarizes the differences in key capabilities.
4444
| | Data Box Disk | Data Box | Data Box Heavy | Import/Export |
4545
|-------------------------------------|---------------------------------|--------------------------------------------------|------------------------------------------|----------------------------------------|
4646
| **Data size** | Up to 35 TBs | Up to 80 TBs per device | Up to 800 TB per device | Variable |
47-
| **Data type** | Azure Blobs | Azure Blobs<br>Azure Files | Azure Blobs<br>Azure Files | Azure Blobs<br>Azure Files |
47+
| **Data type** | Azure Blobs<br>Azure Files* | Azure Blobs<br>Azure Files | Azure Blobs<br>Azure Files | Azure Blobs<br>Azure Files |
4848
| **Form factor** | 5 SSDs per order | 1 X 50-lbs. desktop-sized device per order | 1 X ~500-lbs. large device per order | Up to 10 HDDs/SSDs per order |
4949
| **Initial setup time** | Low <br>(15 mins) | Low to moderate <br> (<30 mins) | Moderate<br>(1-2 hours) | Moderate to difficult<br>(variable) |
5050
| **Send data to Azure** | Yes | Yes | Yes | Yes |
@@ -57,6 +57,8 @@ The following table summarizes the differences in key capabilities.
5757
| **Use when data moves** |Within a commerce boundary|Within a commerce boundary|Within a commerce boundary|Across geographic boundaries, e.g. US to EU|
5858
| **Pricing** | [Pricing](https://azure.microsoft.com/pricing/details/databox/disk/) | [Pricing](https://azure.microsoft.com/pricing/details/storage/databox/) | [Pricing](https://azure.microsoft.com/pricing/details/storage/databox/heavy/) | [Pricing](https://azure.microsoft.com/pricing/details/storage-import-export/) |
5959

60+
*\* Data Box Disk does not support Large File Shares and does not preserve file metadata.*
61+
6062
## Next steps
6163

6264
- Understand how to

articles/storage/common/storage-solution-large-dataset-moderate-high-network.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ If using offline data transfer, use the following table to understand the differ
6060
| | Data Box Disk | Data Box | Data Box Heavy | Import/Export |
6161
|-------------------------------------|---------------------------------|--------------------------------------------------|------------------------------------------|----------------------------------------|
6262
| **Data size** | Up to 35 TBs | Up to 80 TBs per device | Up to 800 TB per device | Variable |
63-
| **Data type** | Azure Blobs | Azure Blobs<br>Azure Files | Azure Blobs<br>Azure Files | Azure Blobs<br>Azure Files |
63+
| **Data type** | Azure Blobs<br>Azure Files* | Azure Blobs<br>Azure Files | Azure Blobs<br>Azure Files | Azure Blobs<br>Azure Files |
6464
| **Form factor** | 5 SSDs per order | 1 X 50-lbs. desktop-sized device per order | 1 X ~500-lbs. large device per order | Up to 10 HDDs/SSDs per order |
6565
| **Initial setup time** | Low <br>(15 mins) | Low to moderate <br> (<30 mins) | Moderate<br>(1-2 hours) | Moderate to difficult<br>(variable) |
6666
| **Send data to Azure** | Yes | Yes | Yes | Yes |
@@ -73,6 +73,8 @@ If using offline data transfer, use the following table to understand the differ
7373
| **Use when data moves** |Within a commerce boundary|Within a commerce boundary|Within a commerce boundary|Across geographic boundaries, e.g. US to EU|
7474
| **Pricing** | [Pricing](https://azure.microsoft.com/pricing/details/databox/disk/) | [Pricing](https://azure.microsoft.com/pricing/details/storage/databox/) | [Pricing](https://azure.microsoft.com/pricing/details/storage/databox/heavy/) | [Pricing](https://azure.microsoft.com/pricing/details/storage-import-export/) |
7575

76+
*\* Data Box Disk does not support Large File Shares and does not preserve file metadata*
77+
7678
If using online data transfer, use the table in the following section for high network bandwidth.
7779

7880
### High network bandwidth

0 commit comments

Comments
 (0)