Skip to content

Commit 53ae688

Browse files
committed
Fixing duplicate headers and merge issues from auto conflict resolve
1 parent f4b9cd7 commit 53ae688

File tree

4 files changed

+2
-9
lines changed

4 files changed

+2
-9
lines changed

articles/virtual-machines/.openpublishing.redirection.virtual-machines.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5059,11 +5059,6 @@
50595059
"source_path_from_root": "/articles/virtual-machines/sizes.md",
50605060
"redirect_url": "/azure/virtual-machines/sizes/overview",
50615061
"redirect_document_id": true
5062-
},
5063-
{
5064-
"source_path_from_root": "/articles/storage/scripts/storage-windows-powershell-sample-create-managed-disk-from-vhd.md",
5065-
"redirect_url": "/azure/virtual-machines/scripts/virtual-machines-powershell-sample-create-managed-disk-from-vhd",
5066-
"redirect_document_id": true
50675062
}
50685063
]
50695064
}

articles/virtual-machines/sizes/general-purpose/a-family.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ ms.author: mattmcinnes
2828

2929
[!INCLUDE [av2-series-specs](./includes/av2-series-specs.md)]
3030

31-
[!INCLUDE [sizes-footer](../includes/sizes-footer.md)]
32-
3331

3432
### Previous-generation A family series
3533
For older sizes, see [previous generation sizes](../previous-gen-sizes-list.md#general-purpose-previous-gen-sizes).

articles/virtual-machines/sizes/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ List of memory optimized VM sizes with links to each series' family page section
158158
| Family | Workloads | Series List |
159159
|----|---|---|
160160
| [E-family](./memory-optimized/e-family.md) | Relational databases <br> Medium to large caches <br> In-memory analytics |[Easv6 and Eadsv6-series](./memory-optimized/e-family.md#easv6-and-eadsv6-series)<br> [Ev5 and Esv5-series](./memory-optimized/e-family.md#ev5-and-esv5-series)<br> [Edv5 and Edsv5-series](./memory-optimized/e-family.md#edv5-and-edsv5-series)<br> [Easv5 and Eadsv5-series](./memory-optimized/e-family.md#easv5-and-eadsv5-series)<br> [Epsv5 and Epdsv5-series](./memory-optimized/e-family.md#epsv5-and-epdsv5-series)<br> [Previous-gen families](./previous-gen-sizes-list.md#memory-optimized-previous-gen-sizes) |
161-
| [Eb-family](./memory-optimized/eb-family.md) | E-family with High remote storage performance | [Ebdsv5 and Ebsv5-series](./memory-optimized/e-family.md#ebdsv5-and-ebsv5-series) |
161+
| [Eb-family](./memory-optimized/e-family.md) | E-family with High remote storage performance | [Ebdsv5 and Ebsv5-series](./memory-optimized/e-family.md#ebdsv5-and-ebsv5-series) |
162162
| [EC-family](./memory-optimized/ec-family.md) | E-family with confidential computing | [ECasv5 and ECadsv5-series](./memory-optimized/ec-family.md#ecasv5-and-ecadsv5-series)<br> [ECas_cc_v5 and ECads_cc_v5-series](./memory-optimized/ec-family.md#ecasccv5-and-ecadsccv5-series)<br> [ECesv5 and ECedsv5-series](./memory-optimized/ec-family.md#ecesv5-and-ecedsv5-series) |
163163
| [M-family](./memory-optimized/m-family.md) | Extremely large databases <br> Large amounts of memory | [Msv3 and Mdsv3-series](./memory-optimized/m-family.md#msv3-and-mdsv3-series)<br> [Mv2-series](./memory-optimized/m-family.md#mv2-series)<br> [Msv2 and Mdsv2-series](./memory-optimized/m-family.md#msv2-and-mdsv2-series) |
164164
| Other families | Older generation memory optimized sizes | [Previous-gen families](./previous-gen-sizes-list.md#memory-optimized-previous-gen-sizes) |

articles/virtual-machines/sizes/storage-optimized/l-family.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: L family VM size series
3-
description: List of sizes in the M family.
3+
description: List of sizes in the L family.
44
author: mattmcinnes
55
ms.service: virtual-machines
66
ms.subservice: sizes

0 commit comments

Comments
 (0)