Skip to content

Commit 32a43d3

Browse files
authored
Merge pull request #87646 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 576b235 + 0b7f307 commit 32a43d3

File tree

7 files changed

+18
-16
lines changed

7 files changed

+18
-16
lines changed

articles/active-directory/authentication/howto-sspr-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Before deploying SSPR, organizations may want to determine how many password res
3434

3535
## Licensing considerations
3636

37-
Azure Active Directory is license per-user meaning each user has to have an appropriate license for the features they utilize.
37+
Azure Active Directory is licensed per-user meaning each user has to have an appropriate license for the features they utilize.
3838

3939
More information about licensing can be found on the [Azure Active Directory pricing page](https://azure.microsoft.com/pricing/details/active-directory/)
4040

articles/azure-monitor/app/ip-addresses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ You need to open some outgoing ports in your server's firewall to allow the Appl
3131

3232
| Purpose | URL | IP | Ports |
3333
| --- | --- | --- | --- |
34-
| Telemetry |dc.services.visualstudio.com<br/>dc.applicationinsights.microsoft.com |40.114.241.141<br/>104.45.136.42<br/>40.84.189.107<br/>168.63.242.221<br/>52.167.221.184<br/>52.169.64.244<br/>40.85.218.175<br/>104.211.92.54<br/>52.175.198.74<br/>51.140.6.23<br/>40.71.12.231<br/>13.69.65.22<br/>13.78.108.165<br/>13.70.72.233<br/>20.44.8.7<br/>13.86.218.248<br/>40.79.138.41<br/>52.231.18.241<br/>13.75.38.7<br/>102.133.162.117<br/>40.73.171.20<br/>102.133.155.50<br/>52.162.110.67<br/>191.233.203.238 | 443 |
34+
| Telemetry |dc.services.visualstudio.com<br/>dc.applicationinsights.microsoft.com |40.114.241.141<br/>104.45.136.42<br/>40.84.189.107<br/>168.63.242.221<br/>52.167.221.184<br/>52.169.64.244<br/>40.85.218.175<br/>104.211.92.54<br/>52.175.198.74<br/>51.140.6.23<br/>40.71.12.231<br/>13.69.65.22<br/>13.78.108.165<br/>13.70.72.233<br/>20.44.8.7<br/>13.86.218.248<br/>40.79.138.41<br/>52.231.18.241<br/>13.75.38.7<br/>102.133.162.117<br/>40.73.171.20<br/>102.133.155.50<br/>52.162.110.67<br/>191.233.203.248 | 443 |
3535
| Live Metrics Stream |rt.services.visualstudio.com<br/>rt.applicationinsights.microsoft.com |23.96.28.38<br/>13.92.40.198 |443 |
3636

3737
## Status Monitor

articles/azure-monitor/insights/solutions-resources-searches-alerts.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,28 +166,28 @@ The properties for Alert action resources are described in the following tables.
166166

167167
| Element name | Required | Description |
168168
|:--|:--|:--|
169-
| Type | Yes | Type of the action. This is **Alert** for alert actions. |
170-
| Name | Yes | Display name for the alert. This is the name that's displayed in the console for the alert rule. |
171-
| Description | No | Optional description of the alert. |
172-
| Severity | Yes | Severity of the alert record from the following values:<br><br> **critical**<br>**warning**<br>**informational**
169+
| `Type` | Yes | Type of the action. This is **Alert** for alert actions. |
170+
| `Name` | Yes | Display name for the alert. This is the name that's displayed in the console for the alert rule. |
171+
| `Description` | No | Optional description of the alert. |
172+
| `Severity` | Yes | Severity of the alert record from the following values:<br><br> **critical**<br>**warning**<br>**informational**
173173

174174

175175
#### Threshold
176176
This section is required. It defines the properties for the alert threshold.
177177

178178
| Element name | Required | Description |
179179
|:--|:--|:--|
180-
| Operator | Yes | Operator for the comparison from the following values:<br><br>**gt = greater than<br>lt = less than** |
181-
| Value | Yes | The value to compare the results. |
180+
| `Operator` | Yes | Operator for the comparison from the following values:<br><br>**gt = greater than<br>lt = less than** |
181+
| `Value` | Yes | The value to compare the results. |
182182

183183
##### MetricsTrigger
184184
This section is optional. Include it for a metric measurement alert.
185185

186186
| Element name | Required | Description |
187187
|:--|:--|:--|
188-
| TriggerCondition | Yes | Specifies whether the threshold is for total number of breaches or consecutive breaches from the following values:<br><br>**Total<br>Consecutive** |
189-
| Operator | Yes | Operator for the comparison from the following values:<br><br>**gt = greater than<br>lt = less than** |
190-
| Value | Yes | Number of the times the criteria must be met to trigger the alert. |
188+
| `TriggerCondition` | Yes | Specifies whether the threshold is for total number of breaches or consecutive breaches from the following values:<br><br>**Total<br>Consecutive** |
189+
| `Operator` | Yes | Operator for the comparison from the following values:<br><br>**gt = greater than<br>lt = less than** |
190+
| `Value` | Yes | Number of the times the criteria must be met to trigger the alert. |
191191

192192

193193
#### Throttling

articles/cognitive-services/Speech-Service/how-to-custom-speech-human-labeled-transcriptions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Here are a few examples of normalization automatically performed on the transcri
6969
| Go get -em! | go get em |
7070
| I'm double-jointed | I'm double jointed |
7171
| 104 Elm Street | one oh four Elm street |
72-
| Tune to 102.7 | tune to one oh two seven |
72+
| Tune to 102.7 | tune to one oh two point seven |
7373
| Pi is about 3.14 | pi is about three point one four |
7474
It costs $3.14| it costs three fourteen |
7575

articles/dms/known-issues-azure-postgresql-online.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ Known issues and limitations associated with online migrations from PostgreSQL t
8585
8686
**Workaround**: Temporarily set a primary key for the table for migration to continue. You can remove the primary key after data migration is complete.
8787
88+
- **Limitation**: JSONB datatype not supported for migration.
89+
8890
## LOB limitations
8991
9092
Large Object (LOB) columns are columns that can grow large. For PostgreSQL, examples of LOB data types include XML, JSON, IMAGE, TEXT, etc.

articles/sql-database/sql-database-managed-instance-transact-sql-information.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ A managed instance can't access file shares and Windows folders, so the followin
334334
- `ALTER ASSEMBLY` can't reference files. See [ALTER ASSEMBLY](https://docs.microsoft.com/sql/t-sql/statements/alter-assembly-transact-sql).
335335

336336
### Database Mail (db_mail)
337-
- `sp_send_dbmail` cannot send atachments using @file_attachments parameter. Local file system and extental shares or Azure blob Storage are not accessible form this procedure.
337+
- `sp_send_dbmail` cannot send attachments using @file_attachments parameter. Local file system and extental shares or Azure blob Storage are not accessible form this procedure.
338338
- See the known issues related to `@query` parameter and authentication.
339339

340340
### DBCC

articles/virtual-machines/windows/sql/virtual-machines-windows-sql-register-with-resource-provider.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,15 +333,15 @@ Yes. Upgrading the manageability mode from lightweight to full is supported via
333333

334334
No. Downgrading the SQL Server IaaS extension manageability mode is not supported. The manageability mode can't be downgraded from full mode to lightweight or no-agent mode, and it can't be downgraded from lightweight mode to no-agent mode.
335335

336-
To change the manageability mode from full manageability, remove the SQL Server IaaS extension. Then, drop the Micorsoft.SqlVirtualMachine resource and re-register the SQL Server VM with the SQL VM resource provider.
336+
To change the manageability mode from full manageability, remove the SQL Server IaaS extension. Then, drop the Microsoft.SqlVirtualMachine resource and re-register the SQL Server VM with the SQL VM resource provider.
337337

338338
**Can I register with the SQL VM resource provider from the Azure portal?**
339339

340340
No. Registering with the SQL VM resource provider is not available in the Azure portal. Registering with the SQL VM resource provider in full manageability mode is supported with the Azure CLI or PowerShell. Registering with the SQL VM resource provider in lightweight or no-agent manageability mode is supported only by Azure PowerShell APIs.
341341

342342
**Can I register a VM with the SQL VM resource provider before SQL Server is installed?**
343343

344-
No. A VM should have at least one SQL Server instance to successfully register with the SQL VM resource provider. If there is no SQL Server instance on the VM, the new Micosoft.SqlVirtualMachine resource will be in a failed state.
344+
No. A VM should have at least one SQL Server instance to successfully register with the SQL VM resource provider. If there is no SQL Server instance on the VM, the new Microsoft.SqlVirtualMachine resource will be in a failed state.
345345

346346
**Can I register a VM with the SQL VM resource provider if there are multiple SQL Server instances?**
347347

@@ -362,4 +362,4 @@ For more information, see the following articles:
362362
* [Overview of SQL Server on a Windows VM](virtual-machines-windows-sql-server-iaas-overview.md)
363363
* [FAQ for SQL Server on a Windows VM](virtual-machines-windows-sql-server-iaas-faq.md)
364364
* [Pricing guidance for SQL Server on a Windows VM](virtual-machines-windows-sql-server-pricing-guidance.md)
365-
* [Release notes for SQL Server on a Windows VM](virtual-machines-windows-sql-server-iaas-release-notes.md)
365+
* [Release notes for SQL Server on a Windows VM](virtual-machines-windows-sql-server-iaas-release-notes.md)

0 commit comments

Comments
 (0)