Skip to content

Commit 6689958

Browse files
author
duongau
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into delegatedns
2 parents 028eaa5 + 9480e10 commit 6689958

File tree

60 files changed

+2396
-647
lines changed

Some content is hidden

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

60 files changed

+2396
-647
lines changed

articles/azure-monitor/agents/diagnostics-extension-stream-event-hubs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ You can use a variety of methods to validate that data is being sent to the even
173173

174174
* [Event Hubs overview](../../event-hubs/event-hubs-about.md)
175175
* [Create an event hub](../../event-hubs/event-hubs-create.md)
176-
* [Event Hubs FAQ](../../event-hubs/event-hubs-faq.md)
176+
* [Event Hubs FAQ](../../event-hubs/event-hubs-faq.yml)
177177

178178
<!-- Images. -->
179179
[0]: ../../event-hubs/media/event-hubs-streaming-azure-diags-data/dashboard.png

articles/azure-monitor/logs/data-security.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Log Analytics has an incident management process that all Microsoft services adh
9999
* Operators working on the Microsoft Azure service have addition training obligations surrounding their access to sensitive systems hosting customer data.
100100
* Microsoft security response personnel receive specialized training for their roles
101101

102-
If loss of any customer data occurs, we notify each customer within one day. However, customer data loss has never occurred with the service.
102+
While very rare, Microsoft will notify each customer within one day if significant loss of any customer data occurs.
103103

104104
For more information about how Microsoft responds to security incidents, see [Microsoft Azure Security Response in the Cloud](https://gallery.technet.microsoft.com/Azure-Security-Response-in-dd18c678/file/150826/4/Microsoft%20Azure%20Security%20Response%20in%20the%20cloud.pdf).
105105

@@ -186,4 +186,4 @@ You can use these additional security features to further secure your Azure Moni
186186
## Next steps
187187
* Learn how to collect data with Log Analytics for your Azure VMs following the [Azure VM quickstart](../vm/quick-collect-azurevm.md).
188188

189-
* If you are looking to collect data from physical or virtual Windows or Linux computers in your environment, see the [Quickstart for Linux computers](../vm/quick-collect-linux-computer.md) or [Quickstart for Windows computers](../vm/quick-collect-windows-computer.md)
189+
* If you are looking to collect data from physical or virtual Windows or Linux computers in your environment, see the [Quickstart for Linux computers](../vm/quick-collect-linux-computer.md) or [Quickstart for Windows computers](../vm/quick-collect-windows-computer.md)

articles/azure-relay/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
- name: Azure Roadmap
9595
href: https://azure.microsoft.com/roadmap/?category=enterprise-integration
9696
- name: FAQ
97-
href: relay-faq.md
97+
href: relay-faq.yml
9898
- name: Blog
9999
href: /archive/blogs/servicebus/
100100
- name: Pricing

articles/azure-relay/relay-api-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ repository.
6666

6767
To learn more about Azure Relay, visit these links:
6868
* [What is Azure Relay?](relay-what-is-it.md)
69-
* [Relay FAQ](relay-faq.md)
69+
* [Relay FAQ](relay-faq.yml)

articles/azure-relay/relay-create-namespace-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Congratulations! You have now created a relay namespace.
2020

2121
## Next steps
2222

23-
* [Relay FAQ](relay-faq.md)
23+
* [Relay FAQ](relay-faq.yml)
2424
* [Get started with .NET](relay-hybrid-connections-dotnet-get-started.md)
2525
* [Get started with Node](relay-hybrid-connections-node-get-started.md)
2626

articles/azure-relay/relay-exceptions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ There are two common causes for this error:
7474
Occasionally, the Relay service might experience delays in processing requests. This might happen, for example, during periods of high traffic. If this occurs, retry your operation after a delay, until the operation is successful. If the same operation continues to fail after multiple attempts, check the [Azure service status site](https://azure.microsoft.com/status/) to see if there are known service outages.
7575

7676
## Next steps
77-
* [Azure Relay FAQs](relay-faq.md)
77+
* [Azure Relay FAQs](relay-faq.yml)
7878
* [Create a relay namespace](relay-create-namespace-portal.md)
7979
* [Get started with Azure Relay and .NET](relay-hybrid-connections-dotnet-get-started.md)
8080
* [Get started with Azure Relay and Node](relay-hybrid-connections-node-get-started.md)

articles/azure-relay/relay-faq.md

Lines changed: 0 additions & 126 deletions
This file was deleted.

0 commit comments

Comments
 (0)