Skip to content

Commit 7aa35cc

Browse files
authored
Merge pull request #104266 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 627ddac + 2e24d26 commit 7aa35cc

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

articles/azure-functions/functions-create-your-first-function-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To complete this tutorial, you must first install [Visual Studio 2019](https://a
2626

2727
[!INCLUDE [Create a project using the Azure Functions template](../../includes/functions-vstools-create.md)]
2828

29-
Visual Studio creates a project and class that contains boilerplate code for the HTTP trigger function type. The `FunctionName` attribute on the method sets the name of the function, which by default is `HttpTrigger`. The `HttpTrigger` attribute specifies that the function is triggered by an HTTP request. The boilerplate code sends an HTTP response that includes a value from the request body or query string.
29+
Visual Studio creates a project and class that contains boilerplate code for the HTTP trigger function type. The `FunctionName` attribute on the method sets the name of the function, which by default is `Function1`. The `HttpTrigger` attribute specifies that the function is triggered by an HTTP request. The boilerplate code sends an HTTP response that includes a value from the request body or query string.
3030

3131
You can expand the capabilities of your function using input and output bindings by applying the appropriate attributes to the method. For more information, see the [Triggers and bindings](functions-dotnet-class-library.md#triggers-and-bindings) section of the [Azure Functions C# developer reference](functions-dotnet-class-library.md).
3232

articles/load-balancer/load-balancer-custom-probe-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.author: allensu
1818

1919
# Load Balancer health probes
2020

21-
When using load-balancing rules with Azure Load Balancer, you need to specify a health probes to allow Load Balancer to detect the backend endpoint status. The configuration of the health probe and probe responses determine which backend pool instances will receive new flows. You can use health probes to detect the failure of an application on a backend endpoint. You can also generate a custom response to a health probe and use the health probe for flow control to manage load or planned downtime. When a health probe fails, Load Balancer will stop sending new flows to the respective unhealthy instance. Outbound connectivity is not impacted, only inbound connectivity is impacted.
21+
When using load-balancing rules with Azure Load Balancer, you need to specify health probes to allow Load Balancer to detect the backend endpoint status. The configuration of the health probe and probe responses determine which backend pool instances will receive new flows. You can use health probes to detect the failure of an application on a backend endpoint. You can also generate a custom response to a health probe and use the health probe for flow control to manage load or planned downtime. When a health probe fails, Load Balancer will stop sending new flows to the respective unhealthy instance. Outbound connectivity is not impacted, only inbound connectivity is impacted.
2222

2323
Health probes support multiple protocols. The availability of a specific health probe protocol varies by Load Balancer SKU. Additionally, the behavior of the service varies by Load Balancer SKU as shown in this table:
2424

articles/marketplace/partner-center-portal/vm-images-to-managed-disks-faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ Updates to the VM images cannot be made during the move.
5656

5757
No, the publishing process will remain the same.
5858

59-
## Next steps
59+
### Can the publisher move their offers to Managed Disk?
6060

61-
Visit the [virtual machine offer publisher guide](https://docs.microsoft.com/azure/marketplace/marketplace-virtual-machines) page.
61+
No, the publishers cannot move their offers to Managed Disk. They will have to wait and their images will be moved automatically. We will send notifications to the publisher before we make any changes.

articles/virtual-desktop/apply-windows-license.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Update-AzVM -ResourceGroupName <resourceGroupName> -VM $vm
3333
## Verify your session host VM is utilizing the licensing benefit
3434
After deploying your VM, run this cmdlet ot verify the license type:
3535
```powershell
36-
Get-AzVM -ResourceGroup <resourceGroupName> -Name <vmName>
36+
Get-AzVM -ResourceGroupName <resourceGroupName> -Name <vmName>
3737
```
3838

3939
A session host VM with the applied Windows license will show you something like this:
@@ -56,5 +56,5 @@ Run the following cmdlet to see a list of all session host VMs that have the Win
5656

5757
```powershell
5858
$vms = Get-AzVM
59-
$vms | ?{$_.LicenseType -like "Windows_Client"} | select ResourceGroupName, Name, LicenseType
60-
```
59+
$vms | Where-Object {$_.LicenseType -like "Windows_Client"} | Select-Object ResourceGroupName, Name, LicenseType
60+
```

includes/functions-folder-structure.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ The [host.json](../articles/azure-functions/functions-host-json.md) file contain
3333
* [F# script](../articles/azure-functions/functions-reference-fsharp.md#folder-structure)
3434
* [Java](../articles/azure-functions/functions-reference-java.md#folder-structure)
3535
* [JavaScript](../articles/azure-functions/functions-reference-node.md#folder-structure)
36+
* [Python](../articles/azure-functions/functions-reference-python.md#folder-structure)

0 commit comments

Comments
 (0)