Skip to content

Commit 665f6c7

Browse files
authored
Merge pull request #239709 from MicrosoftDocs/repo_sync_working_branch
Resolve syncing conflicts from repo_sync_working_branch to main
2 parents b5e23eb + 715dd0c commit 665f6c7

File tree

5 files changed

+7
-23
lines changed

5 files changed

+7
-23
lines changed

articles/active-directory-b2c/customize-ui-with-html.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ To create a public container in Blob storage, perform the following steps:
233233
1. Under **Data storage** in the left-hand menu, select **Containers**.
234234
1. Select **+ Container**.
235235
1. For **Name**, enter *root*. The name can be a name of your choosing, for example *contoso*, but we use *root* in this example for simplicity.
236-
1. For **Public access level**, select **Blob**.
236+
1. For **Public access level**, select **Blob**. By selecting the **Blob** option, you allow an anonymous public read-only access for this container.
237237
1. Select **Create** to create the container.
238238
1. Select **root** to open the new container.
239239

articles/cost-management-billing/reservations/understand-rhel-reservation-charges.md

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,7 @@ For example, if you buy a plan for Red Hat Linux Enterprise Server for a VM with
2626
- 1 deployed VMs with 1 to 4 vCPUs,
2727
- or 0.46 or about 46% of Red Hat Enterprise Linux costs for a VM with 5 or more vCPUs.
2828

29-
### Red Hat Enterprise Linux
30-
31-
Azure portal marketplace names:
32-
- Red Hat Enterprise Linux 6.7
33-
- Red Hat Enterprise Linux 6.8
34-
- Red Hat Enterprise Linux 6.9
35-
- Red Hat Enterprise Linux 6.10
36-
- Red Hat Enterprise Linux 7
37-
- Red Hat Enterprise Linux 7.2
38-
- Red Hat Enterprise Linux 7.3
39-
- Red Hat Enterprise Linux 7.4
40-
- Red Hat Enterprise Linux 7.5
41-
- Red Hat Enterprise Linux 7.6
42-
- Red Hat Enterprise Linux 8.2
43-
44-
[Check Red Hat Enterprise Linux meters that the plan applies to](https://phoenixnap.com/kb/how-to-check-redhat-version)
29+
For more in formation to [Review SUSE VM usage before you buy](understand-suse-reservation-charges.md#review-suse-vm-usage-before-you-buy)
4530

4631
## Next steps
4732

articles/openshift/quickstart-openshift-arm-bicep-template.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ New-AzResourceGroup -Name $resourceGroup -Location $location
655655
```powershell
656656
$suffix=Get-Random # random suffix for the Service Principal
657657
$spDisplayName="sp-$resourceGroup-$suffix"
658-
$azureADAppSp = New-AzADServicePrincipal -DisplayName $displayName -Role Contributor
658+
$azureADAppSp = New-AzADServicePrincipal -DisplayName $spDisplayName -Role Contributor
659659
660660
New-AzRoleAssignment -ObjectId $azureADAppSp.Id -RoleDefinitionName 'User Access Administrator' -ResourceGroupName $resourceGroup -ObjectType 'ServicePrincipal'
661661
New-AzRoleAssignment -ObJectId $azureADAppSp.Id -RoleDefinitionName 'Contributor' -ResourceGroupName $resourceGroup -ObjectType 'ServicePrincipal'
@@ -665,7 +665,6 @@ New-AzRoleAssignment -ObJectId $azureADAppSp.Id -RoleDefinitionName 'Contributor
665665

666666
```powershell
667667
$aadClientSecretDigest = ConvertTo-SecureString -String $azureADAppSp.PasswordCredentials.SecretText -AsPlainText -Force
668-
$aadClientSecretDigest = ConvertTo-SecureString -String $azureADAppSp.PasswordCredentials.SecretText -AsPlainText -Force
669668
```
670669

671670
### Get the service principal for the OpenShift resource provider - PowerShell
@@ -696,7 +695,7 @@ Write-Verbose (ConvertTo-Json $templateParams) -Verbose
696695

697696
```powershell
698697
New-AzResourceGroupDeployment -ResourceGroupName $resourceGroup @templateParams `
699-
-TemplateParameterFile azuredeploy.json
698+
-TemplateFile azuredeploy.json
700699
```
701700

702701
::: zone-end

articles/synapse-analytics/sql/query-parquet-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Your first step is to **create a database** with a datasource that references [N
8989

9090
## Dataset
9191

92-
[NYC Yellow Taxi](https://azure.microsoft.com/services/open-datasets/catalog/nyc-taxi-limousine-commission-yellow-taxi-trip-records/) dataset is used in this sample. You can query Parquet files the same way you [read CSV files](query-parquet-files.md). The only difference is that the `FILEFORMAT` parameter should be set to `PARQUET`. Examples in this article show the specifics of reading Parquet files.
92+
[NYC Yellow Taxi](https://azure.microsoft.com/services/open-datasets/catalog/nyc-taxi-limousine-commission-yellow-taxi-trip-records/) dataset is used in this sample. You can query Parquet files the same way you [read CSV files](query-single-csv-file.md). The only difference is that the `FILEFORMAT` parameter should be set to `PARQUET`. Examples in this article show the specifics of reading Parquet files.
9393

9494
## Query set of parquet files
9595

articles/virtual-machines/linux/quick-create-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.custom: mvc, mode-ui
1616

1717
**Applies to:** :heavy_check_mark: Linux VMs
1818

19-
Azure virtual machines (VMs) can be created through the Azure portal. The Azure portal is a browser-based user interface to create Azure resources. This quickstart shows you how to use the Azure portal to deploy a Linux virtual machine (VM) running Ubuntu 18.04 LTS. To see your VM in action, you also SSH to the VM and install the NGINX web server.
19+
Azure virtual machines (VMs) can be created through the Azure portal. The Azure portal is a browser-based user interface to create Azure resources. This quickstart shows you how to use the Azure portal to deploy a Linux virtual machine (VM) running Ubuntu Server 22.04 LTS. To see your VM in action, you also SSH to the VM and install the NGINX web server.
2020

2121
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
2222

@@ -34,7 +34,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
3434

3535
![Screenshot of the Project details section showing where you select the Azure subscription and the resource group for the virtual machine](./media/quick-create-portal/project-details.png)
3636

37-
1. Under **Instance details**, enter *myVM* for the **Virtual machine name**, and choose *Ubuntu 18.04 LTS - Gen2* for your **Image**. Leave the other defaults. The default size and pricing is only shown as an example. Size availability and pricing are dependent on your region and subscription.
37+
1. Under **Instance details**, enter *myVM* for the **Virtual machine name**, and choose *Ubuntu Server 22.04 LTS - Gen2* for your **Image**. Leave the other defaults. The default size and pricing is only shown as an example. Size availability and pricing are dependent on your region and subscription.
3838

3939
:::image type="content" source="media/quick-create-portal/instance-details.png" alt-text="Screenshot of the Instance details section where you provide a name for the virtual machine and select its region, image, and size.":::
4040

0 commit comments

Comments
 (0)