Skip to content

Commit 02f9f71

Browse files
authored
Merge pull request #99917 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 d619800 + 08a3d10 commit 02f9f71

8 files changed

+14
-14
lines changed

articles/application-gateway/ingress-controller-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Using Application Gateway in addition to AGIC also helps protect your AKS cluste
2323

2424
![Azure Application Gateway + AKS](./media/application-gateway-ingress-controller-overview/architecture.png)
2525

26-
AGIC is configured via the Kubernetes [Ingress resource](http://kubernetes.io/docs/user-guide/ingress/), along with Service and Deployments/Pods. It provides a number of features, leveraging Azure’s native Application Gateway L7 load balancer. To name a few:
26+
AGIC is configured via the Kubernetes [Ingress resource](https://kubernetes.io/docs/user-guide/ingress/), along with Service and Deployments/Pods. It provides a number of features, leveraging Azure’s native Application Gateway L7 load balancer. To name a few:
2727
- URL routing
2828
- Cookie-based affinity
2929
- SSL termination

articles/azure-functions/functions-diagnostics.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To access Azure Functions diagnostics:
2626

2727
## Use the Interactive interface
2828

29-
Once you select a homepage category that best aligns with your function app's problem, Azure Functions diagnostics' interactive interface, Genie, can guide you through diagnosing and solving problem of your app. You can use the tile shortcuts provided by Genie to view the full diagnostic report of the problem category that you are interested. The tile shortcuts provide you a direct way of accessing your diagnostic metrics.
29+
Once you select a homepage category that best aligns with your function app's problem, Azure Functions diagnostics' interactive interface, Genie, can guide you through diagnosing and solving problem of your app. You can use the tile shortcuts provided by Genie to view the full diagnostic report of the problem category that you are interested in. The tile shortcuts provide you a direct way of accessing your diagnostic metrics.
3030

3131
![Genie](./media/functions-diagnostics/genie.png)
3232

@@ -36,11 +36,11 @@ After selecting a tile, you can see a list of topics related to the issue descri
3636

3737
## View a diagnostic report
3838

39-
After you choose a topic, you can view a diagnostic report specific to your function app. Diagnostic reports use status icons to indicate if any specific issues with your app. You see detailed description of the issue, recommended actions, related-metrics, and helpful docs. Customized diagnostic reports are generated from a series of checks run on your function app. Diagnostic reports can be a useful tool for pinpointing problems in your function app and guiding you towards resolving the issue.
39+
After you choose a topic, you can view a diagnostic report specific to your function app. Diagnostic reports use status icons to indicate if there are any specific issues with your app. You see detailed description of the issue, recommended actions, related-metrics, and helpful docs. Customized diagnostic reports are generated from a series of checks run on your function app. Diagnostic reports can be a useful tool for pinpointing problems in your function app and guiding you towards resolving the issue.
4040

4141
## Find the problem code
4242

43-
For script-based functions, you can use **Function Execution** and **Errors under Function App Down or Reporting Errors** to narrow down on the line of code causing exceptions or errors. This feature can be a useful tool for getting to the root cause and fixing issues from a specific line of code. This option isn't available for precompiled C# and Java functions.
43+
For script-based functions, you can use **Function Execution** and **Errors** under **Function App Down or Reporting Errors** to narrow down on the line of code causing exceptions or errors. This feature can be a useful tool for getting to the root cause and fixing issues from a specific line of code. This option isn't available for precompiled C# and Java functions.
4444

4545
![Diagnostic report on function execution errors](./media/functions-diagnostics/diagnostic-report-on-function-execution-errors.png)
4646

articles/azure-functions/functions-networking-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Virtual network triggers are supported in version 2.x and above of the Functions
151151

152152
When your function app runs in either an App Service Plan or an App Service Environment, you can use non-HTTP trigger functions. For your functions to get triggered correctly, you must be connected to a virtual network with access to the resource defined in the trigger connection.
153153

154-
For example, assume you want to configure Azure Cosmos DB to accept traffic only from a virtual network. In this case, you must deploy your function app in an App Service plan that provides virtual network integration with that virtual network. This enabled a function to be triggered by that Azure Cosmos DB resource.
154+
For example, assume you want to configure Azure Cosmos DB to accept traffic only from a virtual network. In this case, you must deploy your function app in an App Service plan that provides virtual network integration with that virtual network. This enables a function to be triggered by that Azure Cosmos DB resource.
155155

156156
## Hybrid Connections
157157

articles/azure-functions/functions-premium-plan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ You can configure the number of pre-warmed instances in the Azure portal by sele
4141

4242
![Elastic Scale Settings](./media/functions-premium-plan/scale-out.png)
4343

44-
You can also configure pre-warmed instances for an app with the Azure CLI
44+
You can also configure pre-warmed instances for an app with the Azure CLI.
4545

4646
```azurecli-interactive
4747
az resource update -g <resource_group> -n <function_app_name>/config/web --set properties.preWarmedInstanceCount=<desired_prewarmed_count> --resource-type Microsoft.Web/sites
@@ -72,7 +72,7 @@ When you create the plan, you configure two settings: the minimum number of inst
7272
7373
If your app requires instances beyond your plan size, it can continue to scale out until the number of instances hits the maximum burst limit. You are billed for instances beyond your plan size only while they are running and rented to you. We will make a best effort at scaling your app out to its defined maximum limit, whereas the minimum plan instances are guaranteed for your app.
7474

75-
You can configure the plan size and maximums in the Azure portal by selected the **Scale Out** options in the plan or a function app deployed to that plan (under **Platform Features**).
75+
You can configure the plan size and maximums in the Azure portal by selecting the **Scale Out** options in the plan or a function app deployed to that plan (under **Platform Features**).
7676

7777
You can also increase the maximum burst limit from the Azure CLI:
7878

articles/azure-functions/functions-reference-node.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ When you work with HTTP triggers, you can access the HTTP request and response o
404404

405405
## Scaling and concurrency
406406

407-
By default, Azure Functions automatically monitors the load on your application and creates additional host instances for Node.js as needed. Functions uses built-in (not user configurable) thresholds for different trigger types to decide when to add instances, such the age of messages and queue size for QueueTrigger. For more information, see [How the consumption and premium plans work](functions-scale.md#how-the-consumption-and-premium-plans-work).
407+
By default, Azure Functions automatically monitors the load on your application and creates additional host instances for Node.js as needed. Functions uses built-in (not user configurable) thresholds for different trigger types to decide when to add instances, such as the age of messages and queue size for QueueTrigger. For more information, see [How the consumption and premium plans work](functions-scale.md#how-the-consumption-and-premium-plans-work).
408408

409409
This scaling behavior is sufficient for many Node.js applications. For CPU-bound applications, you can improve performance further by using multiple language worker processes.
410410

articles/azure-functions/functions-reliable-event-processing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ As a general rule, every function should include a [try/catch block](./functions
5454

5555
### Retry mechanisms and policies
5656

57-
Some exceptions are transient in nature and don't reappear when an operation is attempted again moments later. This is why the first step is always to retry the operation. You could write retry processing rules yourself, but they are so commonplace that a number of tools available. Using these libraries allow you to define robust retry-policies, which can also help preserve processing order.
57+
Some exceptions are transient in nature and don't reappear when an operation is attempted again moments later. This is why the first step is always to retry the operation. You could write retry processing rules yourself, but they are so commonplace that a number of tools are available. Using these libraries allow you to define robust retry policies, which can also help preserve processing order.
5858

5959
Introducing fault-handling libraries to your functions allow you to define both basic and advanced retry policies. For instance, you could implement a policy that follows a workflow illustrated by the following rules:
6060

@@ -77,7 +77,7 @@ The assurance that every message is processed at least one time implies that som
7777

7878
## Stop and restart execution
7979

80-
While a few errors may be acceptable, what if your app experiences significant failures? You may want to stop triggering on events until the system reaches a healthy state. Having the opportunity pause processing is often achieved with a circuit breaker pattern. The circuit breaker pattern allows your app to "break the circuit" of the event process and resume at a later time.
80+
While a few errors may be acceptable, what if your app experiences significant failures? You may want to stop triggering on events until the system reaches a healthy state. Having the opportunity to pause processing is often achieved with a circuit breaker pattern. The circuit breaker pattern allows your app to "break the circuit" of the event process and resume at a later time.
8181

8282
There are two pieces required to implement a circuit breaker in an event process:
8383

articles/azure-government/documentation-government-csp-list.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Below you can find a list of all the authorized Cloud Solution Providers, which
4545
|[Anautics](https://anautics.com)|
4646
|[APEX TECHNOLOGY MANAGEMENT INC](https://www.apex.com)|
4747
|[Applied Information Sciences, Inc.](https://www.appliedis.com)|
48-
|[Apollo Information Systems Corp.](http://www.apollo-is.com/)|
48+
|[Apollo Information Systems Corp.](https://www.apollo-is.com/)|
4949
|[Approved Contact, LLC](https://approvedcontact.com)|
5050
|[Apps4Rent](https://www.apps4rent.com)|
5151
|[Apptus](https://apttus.com)|
@@ -60,7 +60,7 @@ Below you can find a list of all the authorized Cloud Solution Providers, which
6060
|[Avtex Solutions](https://www.avtex.com)|
6161
|[BAE Systems Inc. and Affiliates](https://www.baesystems.com)|
6262
|[BEMO Corp](https://www.bemopro.com/)|
63-
|[Bio Automation Support](http://www.stacsdna.com/)|
63+
|[Bio Automation Support](https://www.stacsdna.com/)|
6464
|[Blackwood Associates, Inc. (dba BAI Federal)](https://www.blackwoodassociates.com/)|
6565
|[Blue Source Group, Inc.](https://www.blackwoodassociates.com/)|
6666
|[Blueforce Development Corporation](https://www.blueforcedev.com/)|
@@ -253,7 +253,7 @@ Below you can find a list of all the authorized Cloud Solution Providers, which
253253
|[Pharicode LLC](https://pharicode.com)|
254254
|[Picis Envision](https://www.picis.com/solution/analytics-suite/)|
255255
|[Pinao Consulting LLC](https://www.pcg-msp.com)|
256-
|[Pitech Solutions Inc](http://www.pitechsol.com/)|
256+
|[Pitech Solutions Inc](https://www.pitechsol.com/)|
257257
|[Planet Technologies](https://go-planet.com)|
258258
|[Plexhosted LLC](https://plexhosted.com/)|
259259
|[Principle Information Technology Company](https://www.principleinfotech.com/)|

articles/azure-government/documentation-government-services-webandmobile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This article outlines the web and mobile services for the Azure Government envir
2222

2323
## Azure Cognitive Search
2424

25-
[Azure Cognitive Search](https://docs.microsoft.com/azure/search/) is generally available in Azure Government. For a self-directed exploration of search functionality using public government data, visit the [Content Search and Intelligence](http://documentsearch.azurewebsites.net/home/) web site, select the dataset "US Court of Appeals District 1", and then choose one of the demo options.
25+
[Azure Cognitive Search](https://docs.microsoft.com/azure/search/) is generally available in Azure Government. For a self-directed exploration of search functionality using public government data, visit the [Content Search and Intelligence](https://documentsearch.azurewebsites.net/home/) web site, select the dataset "US Court of Appeals District 1", and then choose one of the demo options.
2626

2727
Search features that have been widely adopted in government search applications include [cognitive skills](https://docs.microsoft.com/azure/search/cognitive-search-concept-intro), useful for extracting structure and information from large undifferentiated text documents.
2828

0 commit comments

Comments
 (0)