Skip to content

Commit 907f079

Browse files
authored
Merge pull request #183475 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 bb83eaf + 6679dd0 commit 907f079

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

articles/app-service/deploy-zip.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,19 +174,19 @@ The CLI command uses the [Kudu publish API](#kudu-publish-api-reference) to depl
174174
### Deploy a startup script
175175

176176
```bash
177-
az webapp deploy --resource group <group-name> --name <app-name> --src-path scripts/startup.sh --type=startup
177+
az webapp deploy --resource-group <group-name> --name <app-name> --src-path scripts/startup.sh --type=startup
178178
```
179179

180180
### Deploy a library file
181181

182182
```bash
183-
az webapp deploy --resource group <group-name> --name <app-name> --src-path driver.jar --type=lib
183+
az webapp deploy --resource-group <group-name> --name <app-name> --src-path driver.jar --type=lib
184184
```
185185

186186
### Deploy a static file
187187

188188
```bash
189-
az webapp deploy --resource group <group-name> --name <app-name> --src-path config.json --type=static
189+
az webapp deploy --resource-group <group-name> --name <app-name> --src-path config.json --type=static
190190
```
191191

192192
# [Azure PowerShell](#tab/powershell)

articles/azure-functions/functions-bindings-service-bus-trigger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def main(msg: func.ServiceBusMessage):
223223
'to': msg.to,
224224
'user_properties': msg.user_properties,
225225
'metadata' : msg.metadata
226-
})
226+
}, default=str)
227227

228228
logging.info(result)
229229
```

articles/data-factory/format-common-data-model.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ When selecting "Entity Reference" both in the Source and Sink transformations, y
5050

5151
* Local uses the entity defined in the manifest file already being used by the service
5252
* Custom will ask you to point to an entity manifest file that is different from the manifest file the service is using
53-
* Standard will use an entity reference from the standard library of CDM entities maintained in ```Github```.
53+
* Standard will use an entity reference from the standard library of CDM entities maintained in ```GitHub```.
5454

5555
### Sink settings
5656

articles/purview/register-scan-azure-postgresql.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: 'Connect to and manage an Azure database for PostgreSQL'
3-
description: This guide describes how to connect to an Azure database for PostgreSQL single server in Azure Purview, and use Purview's features to scan and manage your Azure database for PostgreSQL source.
2+
title: 'Connect to and manage an Azure Database for PostgreSQL'
3+
description: This guide describes how to connect to an Azure Database for PostgreSQL single server in Azure Purview, and use Purview's features to scan and manage your Azure Database for PostgreSQL source.
44
author: evangelinew
55
ms.author: evwhite
66
ms.service: purview
@@ -10,9 +10,9 @@ ms.date: 11/02/2021
1010
ms.custom: template-how-to, ignite-fall-2021
1111
---
1212

13-
# Connect to and manage an Azure database for PostgreSQL in Azure Purview
13+
# Connect to and manage an Azure Database for PostgreSQL in Azure Purview
1414

15-
This article outlines how to register an Azure database for PostgreSQL deployed with single server deployment option, as well as how to authenticate and interact with an Azure database for PostgreSQL in Azure Purview. For more information about Azure Purview, read the [introductory article](overview.md).
15+
This article outlines how to register an Azure Database for PostgreSQL deployed with single server deployment option, as well as how to authenticate and interact with an Azure Database for PostgreSQL in Azure Purview. For more information about Azure Purview, read the [introductory article](overview.md).
1616

1717
## Supported capabilities
1818

@@ -23,7 +23,7 @@ This article outlines how to register an Azure database for PostgreSQL deployed
2323
\** Lineage is supported if dataset is used as a source/sink in [Data Factory Copy activity](how-to-link-azure-data-factory.md)
2424

2525
> [!Important]
26-
> Purview only supports single server deployment option for Azure database for PostgreSQL.
26+
> Purview only supports single server deployment option for Azure Database for PostgreSQL.
2727
> Versions 8.x to 12.x
2828
2929
## Prerequisites
@@ -36,15 +36,15 @@ This article outlines how to register an Azure database for PostgreSQL deployed
3636

3737
## Register
3838

39-
This section describes how to register an Azure database for PostgreSQL in Azure Purview using the [Purview Studio](https://web.purview.azure.com/).
39+
This section describes how to register an Azure Database for PostgreSQL in Azure Purview using the [Purview Studio](https://web.purview.azure.com/).
4040

4141
### Authentication for registration
4242

43-
Currently, to be able to manage and interact with an Azure database for PostgreSQL single server, only SQL Authentication is supported.
43+
Currently, to be able to manage and interact with an Azure Database for PostgreSQL single server, only SQL Authentication is supported.
4444

4545
#### SQL Authentication
4646

47-
Connecting to an Azure Database for PostgreSQL database requires the fully qualified server name and login credentials. You can follow the instructions in [CONNECT AND QUERY](../postgresql/connect-python.md) to create a login for your Azure database for PostgreSQL if you don't have this available. You will need **username** and **password** for the next steps.
47+
Connecting to an Azure Database for PostgreSQL database requires the fully qualified server name and login credentials. You can follow the instructions in [CONNECT AND QUERY](../postgresql/connect-python.md) to create a login for your Azure Database for PostgreSQL if you don't have this available. You will need **username** and **password** for the next steps.
4848

4949
1. If you do not have an Azure Key vault already, follow [this guide to create an Azure Key Vault](../key-vault/certificates/quick-create-portal.md).
5050
1. Navigate to your key vault in the Azure portal
@@ -56,7 +56,7 @@ Connecting to an Azure Database for PostgreSQL database requires the fully quali
5656

5757
### Steps to register
5858

59-
To register a new Azure database for PostgreSQL in your data catalog, do the following:
59+
To register a new Azure Database for PostgreSQL in your data catalog, do the following:
6060

6161
1. Navigate to your Purview account.
6262

0 commit comments

Comments
 (0)