Skip to content

Commit 8f12af5

Browse files
committed
Merge branch 'main' into release-win365-2204
2 parents 594c0de + 14685b3 commit 8f12af5

14 files changed

Lines changed: 56 additions & 432 deletions

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "memdocs/intune/configuration/vpn-settings-windows-phone-8-1.md",
5+
"redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "memdocs/intune/configuration/email-settings-windows-phone-8-1.md",
10+
"redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "memdocs/intune/configuration/device-restrictions-windows-phone-8-1.md",
15+
"redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "memdocs/intune/configuration/custom-settings-windows-phone-8-1.md",
20+
"redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path": "memdocs/intune/apps/store-apps-windows-phone-8-1.md",
525
"redirect_url": "/mem/intune/apps/apps-add",

memdocs/configmgr/core/get-started/2019/includes/1909/3556022.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ The tool doesn't currently have any tasks to migrate the database from on-premis
9292

9393
- [Backup and restore the database](../../../../servers/manage/backup-and-recovery.md)
9494
- [Configure a SQL Server Always On availability group and allow the data to replicate](../../../../servers/deploy/configure/sql-server-alwayson-for-a-highly-available-site-database.md#changes-for-site-backup)
95-
- [Migrate a SQL Server database to an Azure SQL Server VM](/azure/virtual-machines/windows/sql/virtual-machines-windows-migrate-sql)
95+
- [Migrate a SQL Server database to an Azure SQL Server VM](/azure/azure-sql/virtual-machines/windows/migrate-to-vm-from-sql-server)
9696

9797
#### Site system roles
9898

memdocs/configmgr/core/support/azure-migration-tool.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ The tool doesn't currently have any tasks to migrate the database from on-premis
144144

145145
- [Backup and restore the database](../servers/manage/backup-and-recovery.md)
146146
- [Configure a SQL Server Always On availability group and allow the data to replicate](../servers/deploy/configure/sql-server-alwayson-for-a-highly-available-site-database.md#changes-for-site-backup)
147-
- [Migrate a SQL Server database to an Azure SQL Server VM](/azure/virtual-machines/windows/sql/virtual-machines-windows-migrate-sql)
147+
- [Migrate a SQL Server database to an Azure SQL Server VM](/azure/azure-sql/virtual-machines/windows/migrate-to-vm-from-sql-server)
148148

149149
## Site system roles
150150

memdocs/configmgr/core/understand/site-size-performance-faq.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ sections:
9494
For more information and recommendations on how to maximize Premium Storage performance and run SQL Servers in Azure IaaS VMs, see:
9595
9696
- [Optimize application performance](/azure/storage/storage-premium-storage-performance#optimize-application-performance)
97-
98-
- [Disks guidance](/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-performance#disks-guidance)
99-
97+
98+
- [Disks guidance](/azure/azure-sql/virtual-machines/windows/performance-guidelines-best-practices-checklist#storage)
99+
100100
**Example: Azure-based site server**
101101
102102
[Sizing guidelines](../plan-design/configs/site-size-performance-guidelines.md#general-sizing-guidelines) for a colocated site server and SQL Server with **50,000** clients are eight cores, 32 GB, and 1200 IOPS for site server inboxes, and 2800 IOPS for SQL Server files.
@@ -110,7 +110,7 @@ sections:
110110
| 1xP30 (1024 GB) | 64k ReFS | SQL Server (all files<sup>2</sup>) | 2800 | 3112 |
111111
112112
1. This value is from [Example disk configurations](../plan-design/configs/site-size-performance-guidelines.md#example-disk-configurations).
113-
2. [Azure guidance](/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-performance#disks-guidance) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
113+
2. [Azure guidance](/azure/azure-sql/virtual-machines/windows/performance-guidelines-best-practices-checklist#storage) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
114114
115115
**Example: Azure-based site server (for instant performance increase)**
116116
@@ -128,7 +128,7 @@ sections:
128128
129129
1. Disks are striped using Storage Spaces.
130130
2. This value is from [Example disk configurations](../plan-design/configs/site-size-performance-guidelines.md#example-disk-configurations). VM size limits performance.
131-
3. [Azure guidance](/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-performance#disks-guidance) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
131+
3. [Azure guidance](/azure/azure-sql/virtual-machines/windows/performance-guidelines-best-practices-checklist#storage) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
132132
133133
If you need more performance in future, you can upsize your VM to a DS14v2, which will double CPU and memory. The additional disk bandwidth allowed by that VM size will also instantly boost the available disk IOPS on your previously configured disks.
134134
@@ -142,7 +142,7 @@ sections:
142142
143143
1. Disks are striped using Storage Spaces.
144144
2. This value is from [Example disk configurations](../plan-design/configs/site-size-performance-guidelines.md#example-disk-configurations). VM size limits performance.
145-
3. [Azure guidance](/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-performance#disks-guidance) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
145+
3. [Azure guidance](/azure/azure-sql/virtual-machines/windows/performance-guidelines-best-practices-checklist#storage) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
146146
147147
- name: Other common SQL Server-related performance questions
148148
questions:

memdocs/intune/configuration/custom-settings-windows-phone-8-1.md

Lines changed: 0 additions & 79 deletions
This file was deleted.

memdocs/intune/configuration/device-restrictions-windows-phone-8-1.md

Lines changed: 0 additions & 115 deletions
This file was deleted.

0 commit comments

Comments
 (0)