Skip to content

Commit 724b2b1

Browse files
authored
Merge pull request #176718 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 4f212de + 0652515 commit 724b2b1

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

articles/active-directory/hybrid/how-to-connect-emergency-ad-fs-certificate-rotation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In the event that you need to rotate the AD FS certificates immediately, you can
2222
> For more information, see [Hardware Security Module](/windows-server/identity/ad-fs/deployment/best-practices-securing-ad-fs#hardware-security-module-hsm) under best practices for securing AD FS.
2323
2424
## Determine your Token Signing Certificate thumbprint
25-
In order to revoke the old Token Signing Certificate which AD FS is currently using, you need to determine the thumbprint of the token-sigining certificate. To do this, use the following steps below:
25+
In order to revoke the old Token Signing Certificate which AD FS is currently using, you need to determine the thumbprint of the token-signing certificate. To do this, use the following steps below:
2626

2727
1. Connect to the Microsoft Online Service
2828
`PS C:\>Connect-MsolService`
@@ -37,7 +37,7 @@ By default, AD FS is configured to generate token signing and token decryption c
3737

3838
You can run the following Windows PowerShell command: `PS C:\>Get-AdfsProperties | FL AutoCert*, Certificate*`.
3939

40-
The AutoCertificateRollover property describes whether AD FS is configured to renew token signing and token decrypting certificates automatically. If AutoCertificateRollover is set to TRUE, follow the instructions outlined below in [Generating new self-signed certificate if AutoCertificateRollover is set to TRUE]. If AutoCertificateRollover is set to FALSE, follow the instructions outlined below in [Generating new certificates manually if AutoCertificateRollover is set to FALSE]
40+
The AutoCertificateRollover property describes whether AD FS is configured to renew token signing and token decrypting certificates automatically. If AutoCertificateRollover is set to TRUE, follow the instructions outlined below in [Generating new self-signed certificate if AutoCertificateRollover is set to TRUE](#generating-new-self-signed-certificate-if-autocertificaterollover-is-set-to-true). If AutoCertificateRollover is set to FALSE, follow the instructions outlined below in [Generating new certificates manually if AutoCertificateRollover is set to FALSE](#generating-new-certificates-manually-if-autocertificaterollover-is-set-to-false).
4141

4242

4343
## Generating new self-signed certificate if AutoCertificateRollover is set to TRUE
@@ -138,4 +138,4 @@ Now we want to revoke refresh tokens for users who may have them and force them
138138

139139
- [Managing SSL Certificates in AD FS and WAP in Windows Server 2016](/windows-server/identity/ad-fs/operations/manage-ssl-certificates-ad-fs-wap#replacing-the-ssl-certificate-for-ad-fs)
140140
- [Obtain and Configure Token Signing and Token Decryption Certificates for AD FS](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/dn781426(v=ws.11)#updating-federation-partners)
141-
- [Renew federation certificates for Microsoft 365 and Azure Active Directory](how-to-connect-fed-o365-certs.md)
141+
- [Renew federation certificates for Microsoft 365 and Azure Active Directory](how-to-connect-fed-o365-certs.md)

articles/aks/use-wasi-node-pools.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ az extension update --name aks-preview
5959

6060
### Limitations
6161

62-
* You can't run WebAssebmlies and containers in the same node pool.
62+
* You can't run WebAssemblies and containers in the same node pool.
6363
* Only the WebAssembly(WASI) runtime is available, using the Wasmtime provider.
6464
* The WASM/WASI node pools can't be used for system node pool.
6565
* The *os-type* for WASM/WASI node pools must be Linux.
6666
* Krustlet doesn't work with Azure CNI at this time. For more information, see the [CNI Support for Kruslet GitHub issue][krustlet-cni-support].
67-
* Krustlet doesn't provide networking configuration for WebAssemblies. The WebAssebmly manifest must provide the networking configuration, such as IP address.
67+
* Krustlet doesn't provide networking configuration for WebAssemblies. The WebAssembly manifest must provide the networking configuration, such as IP address.
6868

6969
## Add a WASM/WASI node pool to an existing AKS Cluster
7070

articles/defender-for-iot/organizations/how-to-identify-required-appliances.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This section provides an overview of physical sensor models that are available.
3535
| Model | HPE ProLiant DL360 | HPE ProLiant DL20 | HPE ProLiant DL20 | HPE EL300 |
3636
| Monitoring ports | Up to 15 RJ45 or 8 OPT | Up to 8 RJ45 or 6 OPT | Up to 4 RJ45 | Up to 5 RJ45 |
3737
| Maximum bandwidth [1](#anchortext) | 3 Gb/sec | 1 Gb/sec | 200 Mb/Sec | 100 Mb/sec |
38-
| Maximum protected devices | 10,000 | 10,000 | 1,000 | 800 |
38+
| Maximum protected devices | 12,000 | 10,000 | 1,000 | 800 |
3939

4040
See [Appliance specifications](#appliance-specifications) for vendor details.
4141

@@ -54,7 +54,7 @@ This section provides describes virtual sensors that are available.
5454
| Deployment type | Corporate | Enterprise | SMB |
5555
|--|--|--|--|
5656
| Maximum bandwidth | 2.5 Gb/sec | 800 Mb/sec | 160 Mb/sec |
57-
| Maximum protected devices | 10,000 | 10,000 | 800 |
57+
| Maximum protected devices | 12,000 | 10,000 | 800 |
5858

5959
## On-premises management console appliance
6060

@@ -92,7 +92,7 @@ This section describes hardware specifications for the following appliances:
9292
| Chipset | Intel C621 |
9393
| Memory | 32 GB = 2 x 16-GB 2666MT/s DDR4 ECC UDIMM |
9494
| Storage | 6 x 1.2-TB SAS 12G Enterprise 10K SFF (2.5 in) in Hot-Plug Hard Drive - RAID 5 |
95-
| Network controller | On-board: 2 x 1-Gb Broadcom BCM5720<br>On-board LOM: iDRAC Port Card 1-Gb Broadcom BCM5720<br><br>External: 1 x Intel Ethernet i350 QP 1-Gb Server Adapter, Low Profile |
95+
| Network controller | On-board: 2 x 1 Gb <br>On-board: iLO Port Card 1 Gb <br>External: 1 x HPE Ethernet 1-Gb 4-port 366FLR Adapter |
9696
| Management | HPE iLO Advanced |
9797
| Device access | Two rear USB 3.0<br>One front USB 2.0<br>One internal USB 3.0 |
9898
| Power | 2 x HPE 500 W Flex Slot Platinum Hot Plug Low Halogen Power Supply Kit |

articles/security/fundamentals/feature-availability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ The following tables display the current Azure Sentinel feature availability in
224224
| - [Symantec VIP](../../sentinel/data-connectors-reference.md#symantec-vip-preview) | Public Preview | Public Preview |
225225
| - [Syslog](../../sentinel/connect-syslog.md) | GA | GA |
226226
| - [Threat Intelligence Platform](../../sentinel/connect-threat-intelligence-tip.md)s | Public Preview | Not Available |
227-
| - [Threat Intelligence TAXII](../../sentinel/connect-threat-intelligence-tip.md) | Public Preview | Not Available |
227+
| - [Threat Intelligence TAXII](../../sentinel/connect-threat-intelligence-tip.md) | GA | GA |
228228
| - [Thycotic Secret Server](../../sentinel/data-connectors-reference.md#thycotic-secret-server-preview) | Public Preview | Public Preview |
229229
| - [Trend Micro Deep Security](../../sentinel/data-connectors-reference.md#trend-micro-deep-security) | GA | GA |
230230
| - [Trend Micro TippingPoint](../../sentinel/data-connectors-reference.md#trend-micro-tippingpoint-preview) | Public Preview | Public Preview |

0 commit comments

Comments
 (0)