Skip to content

Commit cd82f17

Browse files
authored
Merge pull request #225860 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 85bc29e + de67aea commit cd82f17

24 files changed

+415
-41
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ The following process is used when a user signs in with a FIDO2 security key:
107107

108108
### FIDO2 security key providers
109109

110-
The following providers offer FIDO2 security keys of different form factors that are known to be compatible with the passwordless experience. We encourage you to evaluate the security properties of these keys by contacting the vendor as well as FIDO Alliance.
110+
The following providers offer FIDO2 security keys of different form factors that are known to be compatible with the passwordless experience. We encourage you to evaluate the security properties of these keys by contacting the vendor as well as the [FIDO Alliance](https://fidoalliance.org/).
111111

112112
| Provider | Biometric | USB | NFC | BLE | FIPS Certified | Contact |
113113
|---------------------------|:-----------------:|:---:|:---:|:---:|:--------------:|-----------------------------------------------------------------------------------------------------|

articles/active-directory/authentication/howto-authentication-passwordless-security-key.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ There are some optional settings on the **Configure** tab to help manage how sec
6161
![Screenshot of FIDO2 security key options](media/howto-authentication-passwordless-security-key/optional-settings.png)
6262

6363
- **Allow self-service set up** should remain set to **Yes**. If set to no, your users won't be able to register a FIDO key through the MySecurityInfo portal, even if enabled by Authentication Methods policy.
64-
- **Enforce attestation** setting to **Yes** requires the FIDO security key metadata to be published and verified with the FIDO Alliance Metadata Service, and also pass Microsoft’s additional set of validation testing. For more information, see [What is a Microsoft-compatible security key?](/windows/security/identity-protection/hello-for-business/microsoft-compatible-security-key)
64+
- **Enforce attestation** setting to **Yes** requires the FIDO security key metadata to be published and verified with the FIDO Alliance Metadata Service, and also pass Microsoft’s additional set of validation testing. For more information, see [What is a Microsoft-compatible security key?](concept-authentication-passwordless.md#fido2-security-key-providers)
6565

6666
**Key Restriction Policy**
6767

articles/active-directory/cloud-sync/how-to-install.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ For reference, your code should look like the following snippet:
8686
</configuration>
8787
```
8888

89-
For more information about security and FIPS, see [Azure AD password hash sync, encryption, and FIPS compliance](https://blogs.technet.microsoft.com/enterprisemobility/2014/06/28/aad-password-sync-encryption-and-fips-compliance/).
90-
89+
For information about security and FIPS, see [Azure AD password hash sync, encryption, and FIPS compliance](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/aad-password-sync-encryption-and-fips-compliance/ba-p/243709).
9190

9291
## Next steps
9392

articles/active-directory/develop/v2-protocols-oidc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ The following table describes error codes that can be returned in the `error` pa
207207

208208
Receiving an ID token in your app might not always be sufficient to fully authenticate the user. You might also need to validate the ID token's signature and verify its claims per your app's requirements. Like all OpenID providers, the Microsoft identity platform's ID tokens are [JSON Web Tokens (JWTs)](https://tools.ietf.org/html/rfc7519) signed by using public key cryptography.
209209

210-
Web apps and web APIs that use ID tokens for authorization must validate them because such applications gate access to data. Other types of application might not benefit from ID token validation, however. Native and single-page apps (SPAs), for example, rarely benefit from ID token validation because any entity with physical access to the device or browser can potentially bypass the validation.
210+
Web apps and web APIs that use ID tokens for authorization must validate them because such applications get access to data. Other types of application might not benefit from ID token validation, however. Native and single-page apps (SPAs), for example, rarely benefit from ID token validation because any entity with physical access to the device or browser can potentially bypass the validation.
211211

212212
Two examples of token validation bypass are:
213213

articles/active-directory/hybrid/how-to-connect-install-prerequisites.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@ The following table shows the minimum requirements for the Azure AD Connect sync
219219
220220
| Number of objects in Active Directory | CPU | Memory | Hard drive size |
221221
| --- | --- | --- | --- |
222-
| Fewer than 10,000 |1.6 GHz |4 GB |70 GB |
223-
| 10,000–50,000 |1.6 GHz |4 GB |70 GB |
222+
| Fewer than 10,000 |1.6 GHz |6 GB |70 GB |
223+
| 10,000–50,000 |1.6 GHz |6 GB |70 GB |
224224
| 50,000–100,000 |1.6 GHz |16 GB |100 GB |
225-
| For 100,000 or more objects, the full version of SQL Server is required. For performance reasons, installing locally is preferred. | | | |
225+
| For 100,000 or more objects, the full version of SQL Server is required. For performance reasons, installing locally is preferred. The following values are valid only for Azure AD Connect installation. If SQL Server will be installed on the same server, further memory, drive, and CPU is required. | | | |
226226
| 100,000–300,000 |1.6 GHz |32 GB |300 GB |
227227
| 300,000–600,000 |1.6 GHz |32 GB |450 GB |
228228
| More than 600,000 |1.6 GHz |32 GB |500 GB |

articles/aks/includes/servicemesh/osm/open-service-mesh-binary-install-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ In a PowerShell-based shell on Windows, use `Invoke-WebRequest` to download the
1212

1313
```powershell
1414
# Specify the OSM version that will be leveraged throughout these instructions
15-
$OSM_VERSION="v1.2=0"
15+
$OSM_VERSION="v1.2.0"
1616
1717
[Net.ServicePointManager]::SecurityProtocol = "tls12"
1818
$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -URI "https://github.com/openservicemesh/osm/releases/download/$OSM_VERSION/osm-$OSM_VERSION-windows-amd64.zip" -OutFile "osm-$OSM_VERSION.zip"

articles/aks/limit-egress-traffic.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ The following FQDN / application rules are optional but recommended for AKS clus
127127
|--------------------------------------------------------------------------------|---------------|----------|
128128
| **`security.ubuntu.com`, `azure.archive.ubuntu.com`, `changelogs.ubuntu.com`** | **`HTTP:80`** | This address lets the Linux cluster nodes download the required security patches and updates. |
129129

130-
If you choose to block/not allow these FQDNs, the nodes will only receive OS updates when you do a [node image upgrade](node-image-upgrade.md) or [cluster upgrade](upgrade-cluster.md).
130+
If you choose to block/not allow these FQDNs, the nodes will only receive OS updates when you do a [node image upgrade](node-image-upgrade.md) or [cluster upgrade](upgrade-cluster.md). Keep in mind that Node Image Upgrades also come with updated packages including security fixes.
131131

132132
## GPU enabled AKS clusters
133133

@@ -152,6 +152,9 @@ The following FQDN / application rules are required for using Windows Server bas
152152
| **`onegetcdn.azureedge.net, go.microsoft.com`** | **`HTTPS:443`** | To install windows-related binaries |
153153
| **`*.mp.microsoft.com, www.msftconnecttest.com, ctldl.windowsupdate.com`** | **`HTTP:80`** | To install windows-related binaries |
154154

155+
If you choose to block/not allow these FQDNs, the nodes will only receive OS updates when you do a [node image upgrade](node-image-upgrade.md) or [cluster upgrade](upgrade-cluster.md). Keep in mind that Node Image Upgrades also come with updated packages including security fixes.
156+
157+
155158
## AKS addons and integrations
156159

157160
### Microsoft Defender for Containers

articles/azure-functions/functions-infrastructure-as-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ resource functionApp 'Microsoft.Web/sites@2022-03-01' = {
614614

615615
The function app must have set `"kind": "functionapp,linux"`, and it must have set property `"reserved": true`. Linux apps should also include a `linuxFxVersion` property under siteConfig. If you're just deploying code, the value for this property is determined by your desired runtime stack in the format of runtime|runtimeVersion. For example: `python|3.7`, `node|14` and `dotnet|3.1`.
616616

617-
The [`WEBSITE_CONTENTAZUREFILECONNECTIONSTRING`](functions-app-settings.md#website_contentazurefileconnectionstring) and [`WEBSITE_CONTENTSHARE`](functions-app-settings.md#website_contentshare) settings aren't supported on Linux Consumption plan.
617+
For Linux Consumption plan it is also required to add the two other settings in the site configuration: [`WEBSITE_CONTENTAZUREFILECONNECTIONSTRING`](functions-app-settings.md#website_contentazurefileconnectionstring) and [`WEBSITE_CONTENTSHARE`](functions-app-settings.md#website_contentshare).
618618

619619
For a sample Bicep file/Azure Resource Manager template, see [Azure Function App Hosted on Linux Consumption Plan](https://github.com/Azure-Samples/function-app-arm-templates/tree/main/function-app-linux-consumption).
620620

articles/azure-netapp-files/understand-guidelines-active-directory-domain-service-site.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The required network ports are as follows:
4141

4242
| Service | Port | Protocol |
4343
| -- | - | - |
44-
|AD Web Services | 9839 | TCP |
44+
|AD Web Services | 9389 | TCP |
4545
| DNS* | 53 | TCP |
4646
| DNS* | 53 | UDP |
4747
| ICMPv4 | N/A | Echo Reply |

articles/azure-signalr/signalr-howto-troubleshoot-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ When the client is connected to the Azure SignalR, the persistent connection bet
242242
### Possible errors seen from the client side
243243

244244
* `The remote party closed the WebSocket connection without completing the close handshake`
245-
* `Service timeout. 30.00ms elapsed without receiving a message from service.`
245+
* `Service timeout. 30000.00ms elapsed without receiving a message from service.`
246246
* `{"type":7,"error":"Connection closed with an error."}`
247247
* `{"type":7,"error":"Internal server error."}`
248248

@@ -332,7 +332,7 @@ This section describes several possibilities leading to server connection drop,
332332

333333
* `[Error]Connection "..." to the service was dropped`
334334
* `The remote party closed the WebSocket connection without completing the close handshake`
335-
* `Service timeout. 30.00ms elapsed without receiving a message from service.`
335+
* `Service timeout. 30000.00ms elapsed without receiving a message from service.`
336336

337337
### Root cause
338338

0 commit comments

Comments
 (0)