Skip to content

Commit 53eb16c

Browse files
authored
Merge pull request #153600 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 1f5c700 + 5d48054 commit 53eb16c

File tree

6 files changed

+31
-10
lines changed

6 files changed

+31
-10
lines changed

articles/active-directory/enterprise-users/groups-dynamic-membership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The following is an example of a properly constructed membership rule with a sin
5757
user.department -eq "Sales"
5858
```
5959

60-
Parentheses are optional for a single expression. The total length of the body of your membership rule cannot exceed 2048 characters.
60+
Parentheses are optional for a single expression. The total length of the body of your membership rule cannot exceed 3072 characters.
6161

6262
## Constructing the body of a membership rule
6363

articles/azure-resource-manager/management/resources-without-resource-group-limit.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ By default, you can deploy up to 800 instances of a resource type in each resour
1111

1212
For some resource types, you need to contact support to have the 800 instance limit removed. Those resource types are noted in this article.
1313

14+
## Microsoft.AlertsManagement
15+
16+
* smartDetectorAlertRules
17+
1418
## Microsoft.Automation
1519

1620
* automationAccounts

articles/cognitive-services/Speech-Service/speech-synthesis-markup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ In the sample above, we're using the International Phonetic Alphabet, also known
622622

623623
Considering that the IPA is not easy to remember, the Speech service defines a phonetic set for seven languages (`en-US`, `fr-FR`, `de-DE`, `es-ES`, `ja-JP`, `zh-CN`, and `zh-TW`).
624624

625-
You can use the `sapi` as the vale for the `alphabet` attribute with custom lexicons as demonstrated below:
625+
You can use the `sapi` as the value for the `alphabet` attribute with custom lexicons as demonstrated below:
626626

627627
```xml
628628
<?xml version="1.0" encoding="UTF-8"?>

articles/machine-learning/how-to-deploy-azure-kubernetes-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ At model deployment time, for a successful model deployment AKS node should be a
134134

135135
After the model is deployed and service starts, azureml-fe will automatically discover it using AKS API and will be ready to route request to it. It must be able to communicate to model PODs.
136136
>[!Note]
137-
>If the deployed model requires any connectivity (e.g. querying external database or other REST service, downloading a BLOG etc), then both DNS resolution and outbound communication for these services should be enabled.
137+
>If the deployed model requires any connectivity (e.g. querying external database or other REST service, downloading a BLOB etc), then both DNS resolution and outbound communication for these services should be enabled.
138138
139139
## Deploy to AKS
140140

articles/synapse-analytics/sql/query-cosmos-db-analytical-store.md

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,32 @@ Serverless SQL pool enables you to query Azure Cosmos DB analytical storage usin
2828

2929
### [OPENROWSET with key](#tab/openrowset-key)
3030

31-
To support querying and analyzing data in an Azure Cosmos DB analytical store, a serverless SQL pool uses the following `OPENROWSET` syntax:
31+
To support querying and analyzing data in an Azure Cosmos DB analytical store, a serverless SQL pool is used. The serverless SQL pool uses the `OPENROWSET` SQL syntax, so you must first convert your Azure Cosmos DB connection string to this format:
3232

3333
```sql
3434
OPENROWSET(
3535
'CosmosDB',
36-
'<Azure Cosmos DB connection string>',
36+
'<SQL connection string for Azure Cosmos DB>',
3737
<Container name>
3838
) [ < with clause > ] AS alias
3939
```
4040

41-
The Azure Cosmos DB connection string specifies the Azure Cosmos DB account name, database name, database account master key, and an optional region name to the `OPENROWSET` function.
41+
The SQL connection string for Azure Cosmos DB specifies the Azure Cosmos DB account name, database name, database account master key, and an optional region name to the `OPENROWSET` function. Some of this information can be taken from the standard Azure Cosmos DB connection string.
42+
43+
Converting from the standard Azure Cosmos DB connection string format:
44+
45+
```
46+
AccountEndpoint=https://<database account name>.documents.azure.com:443/;AccountKey=<database account master key>;
47+
```
48+
49+
The SQL connection string has the following format:
4250

43-
The connection string has the following format:
4451
```sql
4552
'account=<database account name>;database=<database name>;region=<region name>;key=<database account master key>'
4653
```
4754

55+
The region is optional. If omitted, the container's primary region is used.
56+
4857
The Azure Cosmos DB container name is specified without quotation marks in the `OPENROWSET` syntax. If the container name has any special characters, for example, a dash (-), the name should be wrapped within square brackets (`[]`) in the `OPENROWSET` syntax.
4958

5059
### [OPENROWSET with credential](#tab/openrowset-credential)
@@ -54,13 +63,14 @@ You can use `OPENROWSET` syntax that references credential:
5463
```sql
5564
OPENROWSET(
5665
PROVIDER = 'CosmosDB',
57-
CONNECTION = '<Azure Cosmos DB connection string without account key>',
66+
CONNECTION = '<SQL connection string for Azure Cosmos DB without account key>',
5867
OBJECT = '<Container name>',
5968
[ CREDENTIAL | SERVER_CREDENTIAL ] = '<credential name>'
6069
) [ < with clause > ] AS alias
6170
```
6271

63-
The Azure Cosmos DB connection string doesn't contain key in this case. The connection string has the following format:
72+
The SQL connection string for Azure Cosmos DB doesn't contain a key in this case. The connection string has the following format:
73+
6474
```sql
6575
'account=<database account name>;database=<database name>;region=<region name>'
6676
```
@@ -161,6 +171,7 @@ Let's imagine that we've imported some data from the [ECDC COVID dataset](https:
161171
These flat JSON documents in Azure Cosmos DB can be represented as a set of rows and columns in Synapse SQL. The `OPENROWSET` function enables you to specify a subset of properties that you want to read and the exact column types in the `WITH` clause:
162172

163173
### [OPENROWSET with key](#tab/openrowset-key)
174+
164175
```sql
165176
SELECT TOP 10 *
166177
FROM OPENROWSET(
@@ -169,7 +180,9 @@ FROM OPENROWSET(
169180
Ecdc
170181
) with ( date_rep varchar(20), cases bigint, geo_id varchar(6) ) as rows
171182
```
183+
172184
### [OPENROWSET with credential](#tab/openrowset-credential)
185+
173186
```sql
174187
/* Setup - create server-level or database scoped credential with Azure Cosmos DB account key:
175188
CREATE CREDENTIAL MyCosmosDbAccountCredential
@@ -182,7 +195,9 @@ FROM OPENROWSET(
182195
OBJECT = 'Ecdc',
183196
SERVER_CREDENTIAL = 'MyCosmosDbAccountCredential'
184197
) with ( date_rep varchar(20), cases bigint, geo_id varchar(6) ) as rows
198+
185199
```
200+
186201
---
187202
The result of this query might look like the following table:
188203

@@ -252,7 +267,7 @@ WITH ( paper_id varchar(8000),
252267
The result of this query might look like the following table:
253268

254269
| paper_id | title | metadata | authors |
255-
| --- | --- | --- |
270+
| --- | --- | --- | --- |
256271
| bb11206963e831f… | Supplementary Information An eco-epidemi… | `{"title":"Supplementary Informati…` | `[{"first":"Julien","last":"Mélade","suffix":"","af…`|
257272
| bb1206963e831f1… | The Use of Convalescent Sera in Immune-E… | `{"title":"The Use of Convalescent…` | `[{"first":"Antonio","last":"Lavazza","suffix":"", …` |
258273
| bb378eca9aac649… | Tylosema esculentum (Marama) Tuber and B… | `{"title":"Tylosema esculentum (Ma…` | `[{"first":"Walter","last":"Chingwaru","suffix":"",…` |

articles/virtual-machines/workloads/oracle/oracle-oci-overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ Cross-cloud connectivity is limited to the following regions:
4545
* Azure West Europe (WestEurope) & OCI Amsterdam (Netherlands Northwest)
4646
* Azure Japan East (JapanEast) & OCI Tokyo (Japan East)
4747
* Azure West US (WestUS) & OCI San Jose (US West)
48+
* Germany West Central (Frankfurt) & OCI Germany Central (Frankfurt)
49+
4850

4951
## Networking
5052

0 commit comments

Comments
 (0)