Skip to content

Commit 12549f7

Browse files
authored
Merge pull request #269493 from MicrosoftDocs/main
3/19 OOB Publish
2 parents 5f3cd35 + 27cbb2a commit 12549f7

File tree

5 files changed

+32
-36
lines changed

5 files changed

+32
-36
lines changed

articles/ai-services/language-service/question-answering/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Custom question answering is commonly used to build conversational client applic
2020
Custom question answering comprises two capabilities:
2121

2222
* Custom question answering: Using this capability users can customize different aspects like edit question and answer pairs extracted from the content source, define synonyms and metadata, accept question suggestions etc.
23-
* Prebuilt custom question answering: This capability allows users to get a response by querying a text passage without having the need to manage knowledgebases.
23+
* [QnA Maker](./../../qnamaker/Overview/overview.md): This capability allows users to get a response by querying a text passage without having the need to manage knowledge bases.
2424

2525
This documentation contains the following article types:
2626

articles/batch/batch-custom-images.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Use a managed image to create a custom image pool
33
description: Create a Batch custom image pool from a managed image to provision compute nodes with the software and data for your application.
44
ms.topic: conceptual
5-
ms.date: 04/06/2023
5+
ms.date: 03/18/2024
66
ms.devlang: csharp
77
---
88

@@ -38,10 +38,12 @@ To scale Batch pools reliably with a managed image, we recommend creating the ma
3838

3939
### Prepare a VM
4040

41-
If you're creating a new VM for the image, use a first party Azure Marketplace image supported by Batch as the base image for your managed image. Only first party images can be used as a base image. To get a full list of Azure Marketplace image references supported by Azure Batch, see the [List node agent SKUs](/java/api/com.microsoft.azure.batch.protocol.accounts.listnodeagentskus) operation.
41+
If you're creating a new VM for the image, use a first party Azure Marketplace image supported by Batch as the base image for your managed image. Only first party images can be used as a base image. To get a full list of Azure Marketplace image references supported by Azure Batch, see [List Supported Images](/rest/api/batchservice/account/listsupportedimages).
4242

4343
> [!NOTE]
44-
> You can't use a third-party image that has additional license and purchase terms as your base image. For information about these Marketplace images, see the guidance for [Linux](../virtual-machines/linux/cli-ps-findimage.md#check-the-purchase-plan-information) or [Windows](../virtual-machines/windows/cli-ps-findimage.md#view-purchase-plan-properties)VMs.
44+
> You can't use a third-party image that has additional license and purchase terms as your base image. For information about these Marketplace images, see the guidance for [Linux](../virtual-machines/linux/cli-ps-findimage.md#check-the-purchase-plan-information) or [Windows](../virtual-machines/windows/cli-ps-findimage.md#view-purchase-plan-properties) VMs.
45+
>
46+
> To use third-party image, you can use the Azure Compute Gallery. Please refer to [Use the Azure Compute Gallery to create a custom image pool](./batch-sig-images.md) for more information.
4547
4648
- Ensure the VM is created with a managed disk. This is the default storage setting when you create a VM.
4749
- Don't install Azure extensions, such as the Custom Script extension, on the VM. If the image contains a preinstalled extension, Azure may encounter problems when deploying the Batch pool.

articles/batch/batch-sig-images.md

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Use the Azure Compute Gallery to create a custom image pool
33
description: Custom image pools are an efficient way to configure compute nodes to run your Batch workloads.
44
ms.topic: conceptual
5-
ms.date: 11/09/2023
5+
ms.date: 03/20/2024
66
ms.devlang: csharp
77
# ms.devlang: csharp, python
88
ms.custom: devx-track-python, devx-track-azurecli, linux-related-content
@@ -65,17 +65,13 @@ The following steps show how to prepare a VM, take a snapshot, and create an ima
6565

6666
### Prepare a VM
6767

68-
If you're creating a new VM for the image, use a first party Azure Marketplace image supported by Batch as the base image for your managed image. Only first party images can be used as a base image.
68+
If you're creating a new VM for the image, use Azure Marketplace image supported by Batch as the base image for your managed image.
6969

70-
To get a full list of current Azure Marketplace image references supported by Azure Batch, use one of the following APIs to return a list of Windows and Linux VM images including the node agent SKU IDs for each image:
70+
To get a full list of current Azure Marketplace image references supported by Azure Batch, use one of the following APIs to return a list of Windows and Linux VM images:
7171

7272
- PowerShell: [Azure Batch supported images](/powershell/module/az.batch/get-azbatchsupportedimage)
7373
- Azure CLI: [Azure Batch pool supported images](/cli/azure/batch/pool/supported-images)
7474
- Batch service APIs: [Batch service APIs](batch-apis-tools.md#batch-service-apis) and [Azure Batch service supported images](/rest/api/batchservice/account/listsupportedimages)
75-
- List node agent SKUs: [Node agent SKUs](/java/api/com.microsoft.azure.batch.protocol.accounts.listnodeagentskus)
76-
77-
> [!NOTE]
78-
> You can't use a third-party image that has additional license and purchase terms as your base image. For information about these Marketplace images, see the guidance for [Linux](../virtual-machines/linux/cli-ps-findimage.md#check-the-purchase-plan-information) or [Windows](../virtual-machines/windows/cli-ps-findimage.md#view-purchase-plan-properties)VMs.
7975

8076
Follow these guidelines when creating VMs:
8177

@@ -87,23 +83,26 @@ Follow these guidelines when creating VMs:
8783
- Once the VM is running, connect to it via RDP (for Windows) or SSH (for Linux). Install any necessary software or copy desired data.
8884
- For faster pool provisioning, use the [ReadWrite disk cache setting](../virtual-machines/premium-storage-performance.md#disk-caching) for the VM's OS disk.
8985

90-
### Create a VM snapshot
91-
92-
A snapshot is a full, read-only copy of a VHD. To create a snapshot of a VM's OS or data disks, you can use the Azure portal or command-line tools. For steps and options to create a snapshot, see the guidance for [VMs](../virtual-machines/snapshot-copy-managed-disk.md).
93-
94-
### Create an image from one or more snapshots
95-
96-
To create a managed image from a snapshot, use Azure command-line tools such as the [az image create](/cli/azure/image) command. Create an image by specifying an OS disk snapshot and optionally one or more data disk snapshots.
97-
86+
### Create an Azure Compute Gallery
87+
88+
You need to create an Azure Compute Gallery to make your custom image available. Select this gallery when creating image in the following steps. To learn how to create an Azure Compute Gallery for your images, see [Create an Azure Compute Gallery](../virtual-machines/create-gallery.md).
89+
90+
### Create an image
91+
9892
To create an image from a VM in the portal, see [Capture an image of a VM](../virtual-machines/capture-image-portal.md).
99-
93+
10094
To create an image using a source other than a VM, see [Create an image](../virtual-machines/image-version.md).
10195

102-
103-
### Create an Azure Compute Gallery
104-
105-
Once you have successfully created your managed image, you need to create an Azure Compute Gallery to make your custom image available. To learn how to create an Azure Compute Gallery for your images, see [Create an Azure Compute Gallery](../virtual-machines/create-gallery.md).
106-
96+
> [!NOTE]
97+
> If the base image has purchase plan information, ensure that the gallery image has identical purchase plan information as the base image. For more information on creating image which has purchase plan, refer to [Supply Azure Marketplace purchase plan information when creating images](../virtual-machines/marketplace-images.md).
98+
>
99+
> If the base image does not have purchase plan information, avoid specifying any purchase plan information for the gallery image.
100+
>
101+
> For the purchase plan information about these Marketplace images, see the guidance for [Linux](../virtual-machines/linux/cli-ps-findimage.md#check-the-purchase-plan-information) or [Windows](../virtual-machines/windows/cli-ps-findimage.md#view-purchase-plan-properties) VMs.
102+
>
103+
> Use Azure PowerShell [Get-AzGalleryImageDefinition](/powershell/module/az.compute/get-azgalleryimagedefinition) or Azure CLI [az sig image-definition show](/cli/azure/sig/image-definition#az-sig-image-definition-show) to check whether the gallery image has correct plan information.
104+
105+
107106
## Create a pool from a Shared Image using the Azure CLI
108107

109108
To create a pool from your Shared Image using the Azure CLI, use the `az batch pool create` command. Specify the Shared Image ID in the `--image` field. Make sure the OS type and SKU matches the versions specified by `--node-agent-sku-id`

articles/notification-hubs/browser-push.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
---
2-
title: Send browser (web push) notifications with Azure Notification Hubs (preview)
2+
title: Send browser (web push) notifications with Azure Notification Hubs
33
description: Learn about support for browser push notifications in Azure Notification Hubs.
44
services: notification-hubs
55
author: sethmanheim
66
manager: femila
77
ms.service: notification-hubs
88
ms.tgt_pltfrm: mobile-multiple
99
ms.topic: article
10-
ms.date: 03/14/2024
10+
ms.date: 03/19/2024
1111
ms.author: sethm
1212
ms.reviewer: heathertian
13-
ms.lastreviewed: 03/14/2024
13+
ms.lastreviewed: 03/19/2024
1414
---
1515

16-
# Web push notifications with Azure Notification Hubs (preview)
16+
# Web push notifications with Azure Notification Hubs
1717

1818
This article describes how to send browser push notifications to single users through Azure Notification Hubs.
1919

20-
> [!NOTE]
21-
> This feature is currently in preview. To access browser push features [on the Azure portal, use this link](https://portal.azure.com/?feature.browserpush=true).
22-
2320
At a high level, the process is:
2421

2522
1. [Set credentials](#set-credentials):
@@ -86,9 +83,7 @@ To subscribe to browser push notifications on your web site, you can use VAPID k
8683

8784
### Set credentials in Azure portal
8885

89-
You can set credentials for browser push in the Azure portal using the browser credentials. For the preview, [use this link to access the Azure portal](https://portal.azure.com/?feature.browserpush=true) in order to manage browser push features.
90-
91-
To set browser push credentials in the portal, follow these steps:
86+
To set browser push credentials in the Azure portal, follow these steps:
9287

9388
1. In the [Azure portal](https://portal.azure.com), open the **Browser (Web Push)** blade in your notification hub.
9489

articles/postgresql/migrate/migration-service/concepts-migration-service-postgresql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.subservice: flexible-server
1010
ms.topic: conceptual
1111
---
1212

13-
# Migration service in Azure Database for PostgreSQL Preview
13+
# Migration service in Azure Database for PostgreSQL
1414

1515
[!INCLUDE [applies-to-postgresql-flexible-server](../../includes/applies-to-postgresql-flexible-server.md)]
1616

0 commit comments

Comments
 (0)