Skip to content

Commit 92d42c0

Browse files
authored
Merge pull request #93755 from MicrosoftDocs/master
10/28 AM Publish
2 parents 8b71dc5 + 5ec258d commit 92d42c0

File tree

120 files changed

+1683
-668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+1683
-668
lines changed

.openpublishing.redirection.json

Lines changed: 394 additions & 14 deletions
Large diffs are not rendered by default.

articles/active-directory-domain-services/faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Classic virtual networks aren't supported for new deployments. Existing managed
4343
Yes. Azure AD Domain Services can be enabled in an Azure Resource Manager virtual network. Classic Azure virtual networks are no longer supported for when you create a new managed domain.
4444

4545
### Can I migrate my existing managed domain from a Classic virtual network to a Resource Manager virtual network?
46-
Yes, this feature is in preview. For more information, see [Migrate Azure AD Domain Services from the Classic virtual network model to Resource Manager (preview)][migrate-from-classic-vnet.md]
46+
Yes, this feature is in preview. For more information, see [Migrate Azure AD Domain Services from the Classic virtual network model to Resource Manager (preview)](migrate-from-classic-vnet.md).
4747

4848
### Can I enable Azure AD Domain Services in an Azure CSP (Cloud Solution Provider) subscription?
4949
Yes. For more information, see [how to enable Azure AD Domain Services in Azure CSP subscriptions](csp.md).

articles/aks/windows-node-limitations.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ Azure Dev Spaces is currently only available for Linux-based node pools.
8888

8989
Group managed service accounts (gMSA) support is not currently available in AKS.
9090

91+
## Can I use Azure Monitor for containers with Windows nodes and containers?
92+
93+
Yes you can, however Azure Monitor does not gather logs (stdout) from Windows containers. You can still attach to the live stream of stdout logs from a Windows container.
94+
9195
## What if I need a feature which is not supported?
9296

9397
We work hard to bring all the features you need to Windows in AKS, but if you do encounter gaps, the open-source, upstream [aks-engine][aks-engine] project provides an easy and fully customizable way of running Kubernetes in Azure, including Windows support. Please make sure to check out our roadmap of features coming [AKS roadmap][aks-roadmap].

articles/ansible/ansible-manage-azure-dynamic-inventories.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Starting with Ansible 2.8, Ansible provides an [Azure dynamic-inventory plug-in]
150150
Failed to connect to the host via ssh: Host key verification failed.
151151
```
152152
153-
If you do receive the "host-key verification" error, add the following line to the Ansible configuration file. The Ansible configuration file is located at `/etc/ansible/ansible.cfg`.
153+
If you do receive the "host-key verification" error, add the following line to the Ansible configuration file. The Ansible configuration file is located at `/etc/ansible/ansible.cfg` or `~/.ansible.cfg`.
154154
155155
```bash
156156
host_key_checking = False

articles/app-service/containers/quickstart-python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ experiment_id: 1e304dc9-5add-4b
2323

2424
In this quickstart, you deploy a Python web app to [App Service on Linux](app-service-linux-intro.md), Azure's highly scalable, self-patching web hosting service. You use the local [Azure command-line interface (CLI)](/cli/azure/install-azure-cli) on a Mac, Linux, or Windows computer. The web app you configure uses a free App Service tier, so you incur no costs in the course of this article.
2525

26-
If you prefer to deploy apps through an IDE, see [Deploy Python apps to App Service from Visual Studio Code](/python/tutorial-deploy-app-service-on-linux-01).
26+
If you prefer to deploy apps through an IDE, see [Deploy Python apps to App Service from Visual Studio Code](/azure/python/tutorial-deploy-app-service-on-linux-01).
2727

2828
## Prerequisites
2929

@@ -172,7 +172,7 @@ Once deployment has completed, switch back to the browser window open to `http:/
172172
![Run an updated sample Python app in Azure](./media/quickstart-python/run-updated-hello-world-sample-python-app-in-browser.png)
173173

174174
> [!TIP]
175-
> Visual Studio Code provides powerful extensions for Python and Azure App Service, which simplify the process of deploying Python web apps to App Service. For more information, see [Deploy Python apps to App Service from Visual Studio Code](/python/tutorial-deploy-app-service-on-linux-01).
175+
> Visual Studio Code provides powerful extensions for Python and Azure App Service, which simplify the process of deploying Python web apps to App Service. For more information, see [Deploy Python apps to App Service from Visual Studio Code](/azure/python/tutorial-deploy-app-service-on-linux-01).
176176
177177
## Stream logs
178178

articles/asc-for-iot/how-to-deploy-edge.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ If you encounter an issue, container logs are the best way to learn about the st
165165

166166
| Name | IMAGE |
167167
| --- | --- |
168-
| azureiotsecurity | mcr.microsoft.com/ascforiot/azureiotsecurity:1.0.0 |
168+
| azureiotsecurity | mcr.microsoft.com/ascforiot/azureiotsecurity:1.0.1 |
169169
| edgeHub | mcr.microsoft.com/azureiotedge-hub:1.0.8.3 |
170-
| edgeAgent | mcr.microsoft.com/azureiotedge-agent:1.0 |
170+
| edgeAgent | mcr.microsoft.com/azureiotedge-agent:1.0.1 |
171171

172172
If the minimum required containers are not present, check if your IoT Edge deployment manifest is aligned with the recommended settings. For more information, see [Deploy IoT Edge module](#deployment-using-azure-portal).
173173

articles/asc-for-iot/quickstart-onboard-iot-hub.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ To enable security on your IoT Hub:
4242

4343
1. Open your **IoT Hub** in Azure portal.
4444
1. Under the **Security** menu, click **Secure your IoT solution**.
45-
1. Click **Save**.
45+
4646

4747
Congratulations! You've completed enabling Azure Security Center for IoT on your IoT Hub.
4848

articles/azure-functions/functions-bindings-event-grid.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ The following examples show trigger binding in a *function.json* file and [Java
248248
)
249249
String content,
250250
final ExecutionContext context) {
251-
// log
252251
context.getLogger().info("Event content: " + content);
253252
}
254253
```
@@ -285,7 +284,6 @@ Upon arrival, the event's JSON payload is de-serialized into the ```EventSchema`
285284
)
286285
EventSchema event,
287286
final ExecutionContext context) {
288-
// log
289287
context.getLogger().info("Event content: ");
290288
context.getLogger().info("Subject: " + event.subject);
291289
context.getLogger().info("Time: " + event.eventTime); // automatically converted to Date by the runtime

articles/azure-functions/functions-bindings-notification-hubs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ The following table explains the binding configuration properties that you set i
250250

251251
|function.json property | Attribute property |Description|
252252
|---------|---------|----------------------|
253-
|**type** |n/a| Must be set to "notificationHub". |
254-
|**direction** |n/a| Must be set to "out". |
253+
|**type** |n/a| Must be set to `notificationHub`. |
254+
|**direction** |n/a| Must be set to `out`. |
255255
|**name** |n/a| Variable name used in function code for the notification hub message. |
256256
|**tagExpression** |**TagExpression** | Tag expressions allow you to specify that notifications be delivered to a set of devices that have registered to receive notifications that match the tag expression. For more information, see [Routing and tag expressions](../notification-hubs/notification-hubs-tags-segment-push-message.md). |
257257
|**hubName** | **HubName** | Name of the notification hub resource in the Azure portal. |

articles/azure-functions/functions-bindings-service-bus.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ logs a Service Bus queue message:
5858
```cs
5959
[FunctionName("ServiceBusQueueTriggerCSharp")]
6060
public static void Run(
61-
[ServiceBusTrigger("myqueue", AccessRights.Manage, Connection = "ServiceBusConnection")]
61+
[ServiceBusTrigger("myqueue", Connection = "ServiceBusConnection")]
6262
string myQueueItem,
6363
Int32 deliveryCount,
6464
DateTime enqueuedTimeUtc,
@@ -72,12 +72,6 @@ public static void Run(
7272
}
7373
```
7474

75-
This example is for Azure Functions version 1.x. To make this code work for 2.x:
76-
77-
- [omit the access rights parameter](#trigger---configuration)
78-
- change the type of the log parameter from `TraceWriter` to `ILogger`
79-
- change `log.Info` to `log.LogInformation`
80-
8175
### Trigger - C# script example
8276

8377
The following example shows a Service Bus trigger binding in a *function.json* file and a [C# script function](functions-reference-csharp.md) that uses the binding. The function reads [message metadata](#trigger---message-metadata) and logs a Service Bus queue message.

0 commit comments

Comments
 (0)