Skip to content

Commit 77b8628

Browse files
authored
Merge pull request MicrosoftDocs#85148 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 e852fc3 + 526585c commit 77b8628

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

articles/azure-australia/gateway-log-audit-visibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ When implementing the components listed in this article, the following general g
108108
|---|---|
109109
|Australian Regulatory and Policy Compliance Documents|[https://aka.ms/au-irap](https://aka.ms/au-irap)|
110110
|Azure products - Australian regions and non-regional|[https://azure.microsoft.com/global-infrastructure/services/?regions=non-regional,australia-central,australia-central-2,australia-east,australia-southeast](https://azure.microsoft.com/global-infrastructure/services/?regions=non-regional,australia-central,australia-central-2,australia-east,australia-southeast)|
111-
|Microsoft Azure Security and Audit Log Management Whitepaper|[https://download.microsoft.com/download/B/6/C/B6C0A98B-D34A-417C-826E-3EA28CDFC9DD/AzureSecurityandAuditLogManagement_11132014.pdf](http://download.microsoft.com/download/B/6/C/B6C0A98B-D34A-417C-826E-3EA28CDFC9DD/AzureSecurityandAuditLogManagement_11132014.pdf)|
111+
|Microsoft Azure Security and Audit Log Management Whitepaper|[https://download.microsoft.com/download/B/6/C/B6C0A98B-D34A-417C-826E-3EA28CDFC9DD/AzureSecurityandAuditLogManagement_11132014.pdf](https://download.microsoft.com/download/B/6/C/B6C0A98B-D34A-417C-826E-3EA28CDFC9DD/AzureSecurityandAuditLogManagement_11132014.pdf)|
112112
|Microsoft Monitoring Agent Configuration|[https://docs.microsoft.com/azure/azure-monitor/platform/log-analytics-agent](https://docs.microsoft.com/azure/azure-monitor/platform/log-analytics-agent)|
113113
|
114114

articles/azure-functions/functions-bindings-http-webhook.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ Webhook authorization is handled by the webhook receiver component, part of the
781781

782782
The HTTP request length is limited to 100 MB (104,857,600 bytes), and the URL length is limited to 4 KB (4,096 bytes). These limits are specified by the `httpRuntime` element of the runtime's [Web.config file](https://github.com/Azure/azure-webjobs-sdk-script/blob/v1.x/src/WebJobs.Script.WebHost/Web.config).
783783

784-
If a function that uses the HTTP trigger doesn't complete within about 2.5 minutes, the gateway will time out and return an HTTP 502 error. The function will continue running but will be unable to return an HTTP response. For long-running functions, we recommend that you follow async patterns and return a location where you can ping the status of the request. For information about how long a function can run, see [Scale and hosting - Consumption plan](functions-scale.md#consumption-plan).
784+
If a function that uses the HTTP trigger doesn't complete within about 2.5 minutes, the gateway will time out and return an HTTP 502 error. The function will continue running but will be unable to return an HTTP response. For long-running functions, we recommend that you follow async patterns and return a location where you can ping the status of the request. For information about how long a function can run, see [Scale and hosting - Consumption plan](functions-scale.md#timeout).
785785

786786
## Trigger - host.json properties
787787

articles/azure-monitor/platform/data-ingestion-time.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Ingestion time may vary for different resources under different circumstances. Y
8484
### Ingestion latency delays
8585
You can measure the latency of a specific record by comparing the result of the [ingestion_time()](/azure/kusto/query/ingestiontimefunction) function to the _TimeGenerated_ property. This data can be used with various aggregations to find how ingestion latency behaves. Examine some percentile of the ingestion time to get insights for large amount of data.
8686

87-
For example, the following query will show you which computers had the highest ingestion time over the current day:
87+
For example, the following query will show you which computers had the highest ingestion time over the prior 8 hours:
8888

8989
``` Kusto
9090
Heartbeat
@@ -95,7 +95,7 @@ Heartbeat
9595
| top 20 by percentile_E2EIngestionLatency_95 desc
9696
```
9797

98-
If you want to drill down on the ingestion time for a specific computer over a period of time, use the following query which also visualizes the data in a graph:
98+
If you want to drill down on the ingestion time for a specific computer over a period of time, use the following query which also visualizes the data from the past day in a graph:
9999

100100
``` Kusto
101101
Heartbeat

articles/azure-resource-manager/resource-manager-tutorial-use-conditions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Azure QuickStart Templates is a repository for Resource Manager templates. Inste
8282
Make two changes to the existing template:
8383
8484
* Add a storage account name parameter. Users can specify either a new storage account name or an existing storage account name.
85-
* Add a new parameter called **newOrExisting**. The deployment uses this parameter to determine where to create a new storage account or use an existing storage account.
85+
* Add a new parameter called **newOrExisting**. The deployment uses this parameter to determine whether to create a new storage account or use an existing storage account.
8686
8787
Here is the procedure to make the changes:
8888
@@ -134,7 +134,7 @@ Here is the procedure to make the changes:
134134
135135
## Deploy the template
136136
137-
Follow the instructions in [Deploy the template](./resource-manager-tutorial-create-templates-with-dependent-resources.md#deploy-the-template) to open the Cloud shell and upload the revised template, and then run the follow PowerShell script to deploy the template.
137+
Follow the instructions in [Deploy the template](./resource-manager-tutorial-create-templates-with-dependent-resources.md#deploy-the-template) to open the Cloud shell and upload the revised template, and then run the following PowerShell script to deploy the template.
138138
139139
```azurepowershell
140140
$resourceGroupName = Read-Host -Prompt "Enter the resource group name"
@@ -159,7 +159,7 @@ New-AzResourceGroupDeployment `
159159
> [!NOTE]
160160
> The deployment fails if **newOrExisting** is **new**, but the storage account with the storage account name specified already exists.
161161
162-
Try making another deployment with **newOrExisting** set to "existing" and specify an exiting storage account. To create a storage account beforehand, see [Create a storage account](../storage/common/storage-quickstart-create-account.md).
162+
Try making another deployment with **newOrExisting** set to "existing" and specify an existing storage account. To create a storage account beforehand, see [Create a storage account](../storage/common/storage-quickstart-create-account.md).
163163

164164
## Clean up resources
165165

articles/sql-database/sql-database-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ The following table lists the major features of SQL Server and provides informat
7979
| [Full-text search (FTS)](https://docs.microsoft.com/sql/relational-databases/search/full-text-search) | Yes, but third-party word breakers are not supported | Yes, but [third-party word breakers are not supported](sql-database-managed-instance-transact-sql-information.md#full-text-semantic-search) |
8080
| [Functions](https://docs.microsoft.com/sql/t-sql/functions/functions) | Most - see individual functions | Yes - see [Stored procedures, functions, triggers differences](sql-database-managed-instance-transact-sql-information.md#stored-procedures-functions-and-triggers) |
8181
| [Graph processing](https://docs.microsoft.com/sql/relational-databases/graphs/sql-graph-overview) | Yes | Yes |
82-
| [In-memory optimization](https://docs.microsoft.com/sql/relational-databases/in-memory-oltp/in-memory-oltp-in-memory-optimization) | Yes - [Premium and Business Critical tiers only](sql-database-in-memory.md) | Yes - [Business Critical tier only](sql-database-managed-instance.md) |
82+
| [In-memory optimization](https://docs.microsoft.com/sql/relational-databases/in-memory-oltp/in-memory-oltp-in-memory-optimization) | Yes - [Premium and Business Critical tiers only](sql-database-in-memory.md) Limited support for non-persistent In-Memory objects such as table types | Yes - [Business Critical tier only](sql-database-managed-instance.md) |
8383
| [JSON data support](https://docs.microsoft.com/sql/relational-databases/json/json-data-sql-server) | [Yes](sql-database-json-features.md) | [Yes](sql-database-json-features.md) |
8484
| [Language elements](https://docs.microsoft.com/sql/t-sql/language-elements/language-elements-transact-sql) | Most - see individual elements | Yes - see [T-SQL differences](sql-database-managed-instance-transact-sql-information.md) |
8585
| [Linked servers](https://docs.microsoft.com/sql/relational-databases/linked-servers/linked-servers-database-engine) | No - see [Elastic query](sql-database-elastic-query-horizontal-partitioning.md) | Yes. Only to [SQL Server and SQL Database](sql-database-managed-instance-transact-sql-information.md#linked-servers) without distributed transactions. |

articles/virtual-machines/troubleshooting/custom-routes-enable-kms-activation.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ To add the custom route, follow these steps:
4949

5050
[!INCLUDE [updated-for-az.md](../../../includes/updated-for-az.md)]
5151

52+
> [!NOTE]
53+
> Activation uses public IP addresses and will be affected by a Standard SKU Load Balancer configuration. Carefully review [Outbound connections in Azure](https://docs.microsoft.com/azure/load-balancer/load-balancer-outbound-connections) to learn about the requirements.
54+
5255
1. Open Azure PowerShell, and then [sign in to your Azure subscription](https://docs.microsoft.com/powershell/azure/authenticate-azureps).
5356
2. Run the following commands:
5457

0 commit comments

Comments
 (0)