Skip to content

Commit f4126db

Browse files
authored
Merge pull request #111143 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 9256bb0 + 0cdda6a commit f4126db

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

articles/app-service/webjobs-dotnet-deploy-vs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ WebJobs uses the same CRON expressions for scheduling as the timer trigger in Az
221221

222222
[!INCLUDE [webjobs-cron-timezone-note](../../includes/webjobs-cron-timezone-note.md)]
223223

224-
### setting.job reference
224+
### settings.job reference
225225

226226
The following settings are supported by WebJobs:
227227

articles/automation/troubleshoot/desired-state-configuration.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ VM has reported a failure when processing extension 'Microsoft.Powershell.DSC /
109109

110110
This issue is caused by a bad or expired certificate. For more information, see [Certificate expiration and reregistration](../automation-dsc-onboarding.md#re-registering-a-node).
111111

112+
This issue could also be caused by a proxy configuration not allowing access to ***.azure-automation.net**. For more information, see [Configuration of private networks](../automation-dsc-overview.md#network-planning).
113+
112114
### Resolution
113115

114116
Follow the steps listed below to re-register the failing DSC node.

articles/azure-government/documentation-government-compute.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@ For details on this service and how to use it, see [Azure Virtual Machines Sizes
2424
### Variations
2525
For available virtual machine sizes in Azure Government, see <a href="https://azure.microsoft.com/regions/services/">Products Available by Region</a>
2626

27+
The following Virtual Machines features are not currently available in Azure Government:
28+
29+
- Settings
30+
- Continuous delivery
31+
- Operations
32+
- Auto-Shutdown
33+
- Monitoring
34+
- Application Insights
35+
- Support + Troubleshooting
36+
- Ubuntu Advantage support plan
37+
2738
### Data Considerations
2839
The following information identifies the Azure Government boundary for Azure Virtual Machines:
2940

@@ -63,7 +74,6 @@ The [Azure Functions](https://docs.microsoft.com/azure/azure-functions/) service
6374
### Variations
6475
The following Functions features are not currently available in Azure Government:
6576

66-
- The [App Service plan](../azure-functions/functions-scale.md#app-service-plan) is available in Azure Government. The Consumption plan is available in USGov Virginia region. To learn more about the two hosting plans, click [here](../azure-functions/functions-scale.md)
6777
- [Monitoring via Application Insights](../azure-functions/functions-monitoring.md) is not available yet.
6878

6979
The URLs for Function are different:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Variations in Azure Government:
5151

5252
- Custom Vision Portal: https://www.customvision.azure.us
5353
- Endpoint URL: https://virginia.api.cognitive.microsoft.us/customvision/v3.0/
54-
- Available SKUs: F0,S0
54+
- Available SKUs: S0
5555

5656
For more information, see the [global Azure documentation](https://go.microsoft.com/fwlink/?linkid=848046), [Custom Vision Training API reference](https://go.microsoft.com/fwlink/?linkid=865445), and [Custom Vision Prediction API reference](https://go.microsoft.com/fwlink/?linkid=865446)
5757

@@ -128,7 +128,7 @@ Variations in Azure Government:
128128
- Endpoint: https://virginia.api.cognitive.microsoft.us/luis/v2.0
129129
- LUIS portal: https://luis.azure.us
130130
- Available SKUs: S0
131-
- Speech Requests, Speech Priming, Spell Check, and Prebuilt Domains are not currently available
131+
- Speech Requests and Prebuilt Domains are not currently available
132132

133133
For more information, see [global Azure documentation](../cognitive-services/luis/what-is-luis.md) for Language Understanding.
134134

articles/azure-monitor/app/ilogger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ You can still use the old provider. (It will be removed only in a major version
209209
- In ASP.NET Core (2.0 and later), the recommended way to [enable logging providers](https://github.com/aspnet/Announcements/issues/255) is by using extension methods on ILoggingBuilder in **Program.cs** itself.
210210

211211
> [!Note]
212-
> The new provider is available for applications that target NETSTANDARD2.0 or later. If your application targets older .NET Core versions, such as .NET Core 1.1, or if it targets the .NET Framework, continue to use the old provider.
212+
> The new provider is available for applications that target NETSTANDARD2.0 or later. From [Microsoft.ApplicationInsights.AspNet SDK](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) version 2.14.0 onwards, new provider is also available for applications that target .NET Framework NET461 or later. If your application targets older .NET Core versions, such as .NET Core 1.1, or if it targets the .NET Framework less than NET46, continue to use the old provider.
213213
214214
## Console application
215215

articles/virtual-network/tutorial-create-route-table-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ Before you select **Create** to create the public or private VM, go to the follo
203203
| Basics | Resource group | **myResourceGroup** |
204204
| | Virtual machine name | *myVmPublic* |
205205
| | Public inbound ports | **Allow selected ports** |
206-
| | Select inbound ports | **HTTP** and **RDP** |
206+
| | Select inbound ports | **RDP** |
207207
| Networking | Virtual network | **myVirtualNetwork** |
208208
| | Subnet | **Public (10.0.0.0/24)** |
209209
| | Public IP address | The default |
@@ -216,7 +216,7 @@ Before you select **Create** to create the public or private VM, go to the follo
216216
| Basics | Resource group | **myResourceGroup** |
217217
| | Virtual machine name | *myVmPrivate* |
218218
| | Public inbound ports | **Allow selected ports** |
219-
| | Select inbound ports | **HTTP** and **RDP** |
219+
| | Select inbound ports | **RDP** |
220220
| Networking | Virtual network | **myVirtualNetwork** |
221221
| | Subnet | **Private (10.0.1.0/24)** |
222222
| | Public IP address | The default |

0 commit comments

Comments
 (0)