Skip to content

Commit 4792fb5

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-permissions-jan
2 parents 68af0ee + f9a7435 commit 4792fb5

File tree

44 files changed

+954
-799
lines changed

Some content is hidden

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

44 files changed

+954
-799
lines changed

.openpublishing.redirection.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15467,6 +15467,46 @@
1546715467
"redirect_url": "/azure/developer/chef/windows-vm-configure",
1546815468
"redirect_document_id": false
1546915469
},
15470+
{
15471+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-configure-your-solution.md",
15472+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-configure-your-solution",
15473+
"redirect_document_id": false
15474+
},
15475+
{
15476+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-create-micro-agent-module-twin.md",
15477+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-create-micro-agent-module-twin",
15478+
"redirect_document_id": false
15479+
},
15480+
{
15481+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-standalone-agent-binary-installation.md",
15482+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
15483+
"redirect_document_id": false
15484+
},
15485+
{
15486+
"source_path_from_root": "/articles/defender-for-iot/device-builders/how-to-configure-agent-based-solution.md",
15487+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-configure-agent-based-solution",
15488+
"redirect_document_id": false
15489+
},
15490+
{
15491+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-investigate-security-recommendations.md",
15492+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-investigate-security-recommendations",
15493+
"redirect_document_id": false
15494+
},
15495+
{
15496+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-investigate-security-alerts.md",
15497+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-investigate-security-alerts",
15498+
"redirect_document_id": false
15499+
},
15500+
{
15501+
"source_path_from_root": "/articles/defender-for-iot/device-builders/tutorial-configure-micro-agent-twin.md",
15502+
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-configure-micro-agent-twin",
15503+
"redirect_document_id": false
15504+
},
15505+
{
15506+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-azure-rtos-security-module.md",
15507+
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-quickstart-azure-rtos-security-module",
15508+
"redirect_document_id": false
15509+
},
1547015510
{
1547115511
"source_path_from_root": "/articles/defender-for-iot/organizations/integration-cisco-ise-pxgrid.md",
1547215512
"redirect_url": "/azure/defender-for-iot/organizations/integration-forescout",

articles/cognitive-services/Speech-Service/includes/how-to/text-to-speech-basics/text-to-speech-basics-python.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
author: eric-urban
33
ms.service: cognitive-services
44
ms.topic: include
5-
ms.date: 07/02/2021
5+
ms.date: 01/16/2022
66
ms.author: eur
77
---
88

@@ -43,7 +43,7 @@ There are a few ways that you can initialize a [`SpeechConfig`](/python/api/azur
4343
In this example, you create a [`SpeechConfig`](/python/api/azure-cognitiveservices-speech/azure.cognitiveservices.speech.speechconfig) using a speech key and location/region. Get these credentials by following steps in [Try the Speech service for free](../../../overview.md#try-the-speech-service-for-free).
4444

4545
```python
46-
speech_config = SpeechConfig(subscription="<paste-your-speech-key-here>", region="<paste-your-speech-location/region-here>")
46+
speech_config = speechsdk.SpeechConfig(subscription="<paste-your-speech-key-here>", region="<paste-your-speech-location/region-here>")
4747
```
4848

4949
## Select synthesis language and voice
@@ -67,13 +67,13 @@ Next, you create a [`SpeechSynthesizer`](/python/api/azure-cognitiveservices-spe
6767
To start, create an `AudioOutputConfig` to automatically write the output to a `.wav` file, using the `filename` constructor param.
6868

6969
```python
70-
audio_config = AudioOutputConfig(filename="path/to/write/file.wav")
70+
audio_config = speechsdk.audio.AudioOutputConfig(filename="path/to/write/file.wav")
7171
```
7272

7373
Next, instantiate a `SpeechSynthesizer` by passing your `speech_config` object and the `audio_config` object as params. Then, executing speech synthesis and writing to a file is as simple as running `speak_text_async()` with a string of text.
7474

7575
```python
76-
synthesizer = SpeechSynthesizer(speech_config=speech_config, audio_config=audio_config)
76+
synthesizer = speechsdk.SpeechSynthesizer(speech_config=speech_config, audio_config=audio_config)
7777
synthesizer.speak_text_async("A simple test to write to a file.")
7878
```
7979

@@ -84,7 +84,7 @@ Run the program, and a synthesized `.wav` file is written to the location you sp
8484
In some cases, you may want to directly output synthesized speech directly to a speaker. To do this, use the example in the previous section, but change the `AudioOutputConfig` by removing the `filename` param, and set `use_default_speaker=True`. This outputs to the current active output device.
8585

8686
```python
87-
audio_config = AudioOutputConfig(use_default_speaker=True)
87+
audio_config = speechsdk.audio.AudioOutputConfig(use_default_speaker=True)
8888
```
8989

9090
## Get result as an in-memory stream
@@ -103,7 +103,7 @@ It's simple to make this change from the previous example. First, remove the `Au
103103
This time, you save the result to a [`SpeechSynthesisResult`](/python/api/azure-cognitiveservices-speech/azure.cognitiveservices.speech.speechsynthesisresult) variable. The `audio_data` property contains a `bytes` object of the output data. You can work with this object manually, or you can use the [`AudioDataStream`](/python/api/azure-cognitiveservices-speech/azure.cognitiveservices.speech.audiodatastream) class to manage the in-memory stream. In this example you use the `AudioDataStream` constructor to get a stream from the result.
104104

105105
```python
106-
synthesizer = SpeechSynthesizer(speech_config=speech_config, audio_config=None)
106+
synthesizer = speechsdk.SpeechSynthesizer(speech_config=speech_config, audio_config=None)
107107
result = synthesizer.speak_text_async("Getting the response as an in-memory stream.").get()
108108
stream = AudioDataStream(result)
109109
```
@@ -127,10 +127,10 @@ In this example, you specify a high-fidelity RIFF format `Riff24Khz16BitMonoPcm`
127127

128128
```python
129129
speech_config.set_speech_synthesis_output_format(SpeechSynthesisOutputFormat["Riff24Khz16BitMonoPcm"])
130-
synthesizer = SpeechSynthesizer(speech_config=speech_config, audio_config=None)
130+
synthesizer = speechsdk.SpeechSynthesizer(speech_config=speech_config, audio_config=None)
131131

132132
result = synthesizer.speak_text_async("Customizing audio output format.").get()
133-
stream = AudioDataStream(result)
133+
stream = speechsdk.AudioDataStream(result)
134134
stream.save_to_wav_file("path/to/write/file.wav")
135135
```
136136

@@ -158,17 +158,17 @@ Next, you need to change the speech synthesis request to reference your XML file
158158
> `encoding` parameter as follows: `open("ssml.xml", "r", encoding="utf-8-sig")`.
159159
160160
```python
161-
synthesizer = SpeechSynthesizer(speech_config=speech_config, audio_config=None)
161+
synthesizer = speechsdk.SpeechSynthesizer(speech_config=speech_config, audio_config=None)
162162

163163
ssml_string = open("ssml.xml", "r").read()
164164
result = synthesizer.speak_ssml_async(ssml_string).get()
165165

166-
stream = AudioDataStream(result)
166+
stream = speechsdk.AudioDataStream(result)
167167
stream.save_to_wav_file("path/to/write/file.wav")
168168
```
169169

170170
> [!NOTE]
171-
> To change the voice without using SSML, you can set the property on the `SpeechConfig` by using `SpeechConfig.speech_synthesis_voice_name = "en-US-JennyNeural"`
171+
> To change the voice without using SSML, you can set the property on the `SpeechConfig` by using `speech_config.speech_synthesis_voice_name = "en-US-JennyNeural"`
172172
173173
## Get facial pose events
174174

articles/defender-for-cloud/deploy-vulnerability-assessment-byol-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Supported solutions report vulnerability data to the partner's management platfo
3535

3636
1. From Defender for Cloud's menu, open the **Recommendations** page.
3737

38-
1. Select the recommendation **A vulnerability assessment solution should be enabled on your virtual machines**.
38+
1. Select the recommendation **Machines should have a vulnerability assessment solution**.
3939

4040
:::image type="content" source="./media/deploy-vulnerability-assessment-vm/recommendation-page-machine-groupings.png" alt-text="The groupings of the machines in the **A vulnerability assessment solution should be enabled on your virtual machines** recommendation page" lightbox="./media/deploy-vulnerability-assessment-vm/recommendation-page-machine-groupings.png":::
4141

articles/defender-for-cloud/deploy-vulnerability-assessment-vm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ The vulnerability scanner extension works as follows:
7171

7272
1. From Defender for Cloud's menu, open the **Recommendations** page.
7373

74-
1. Select the recommendation **A vulnerability assessment solution should be enabled on your virtual machines**.
74+
1. Select the recommendation **Machines should have a vulnerability assessment solution**.
7575

7676
:::image type="content" source="./media/deploy-vulnerability-assessment-vm/recommendation-page-machine-groupings.png" alt-text="The groupings of the machines in the recommendation page." lightbox="./media/deploy-vulnerability-assessment-vm/recommendation-page-machine-groupings.png":::
7777

@@ -110,7 +110,7 @@ The vulnerability scanner extension works as follows:
110110
> - If you haven't got a third-party vulnerability scanner configured, you won't be offered the opportunity to deploy it.
111111
> - If your selected machines aren't protected by Microsoft Defender for servers, the Defender for Cloud integrated vulnerability scanner option won't be available.
112112
113-
:::image type="content" source="./media/deploy-vulnerability-assessment-vm/recommendation-remediation-options-builtin.png" alt-text="The options for which type of remediation flow you want to choose when responding to the recommendation **A vulnerability assessment solution should be enabled on your virtual machines** recommendation page":::
113+
:::image type="content" source="./media/deploy-vulnerability-assessment-vm/recommendation-remediation-options-builtin.png" alt-text="The options for which type of remediation flow you want to choose when responding to the recommendation ** Machines should have a vulnerability assessment solution** recommendation page":::
114114

115115
1. Choose the recommended option, **Deploy integrated vulnerability scanner**, and **Proceed**.
116116

articles/defender-for-iot/device-builders/TOC.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,26 @@
1313
- name: Quickstarts
1414
expanded: true
1515
items:
16-
- name: Onboard to Defender for IoT agent-based solution
17-
displayName: IoT Hub, existing, enable
16+
- name: Enable Microsoft Defender for IoT on Azure IoT Hub
17+
displayName: IoT Hub, existing, enable, enable, onboard
1818
href: quickstart-onboard-iot-hub.md
19-
- name: Install Defender for IoT micro agent (Preview)
20-
displayName: package, authentication, methods, certificate, authenticate, version
21-
href: quickstart-standalone-agent-binary-installation.md
22-
- name: Create a Defender for IoT micro agent module twin (Preview)
23-
href: quickstart-create-micro-agent-module-twin.md
24-
- name: Configure Defender-IoT-micro-agent for Azure RTOS
25-
href: quickstart-azure-rtos-security-module.md
26-
- name: Add Azure resources to your IoT solution
19+
- name: Tutorials
20+
items:
21+
- name: Add a resource group to your IoT solution
2722
displayName: resources, monitored, resource
28-
href: quickstart-configure-your-solution.md
23+
href: tutorial-configure-your-solution.md
24+
- name: Create a DefenderforIoTMicroAgent module twin (Preview)
25+
href: tutorial-create-micro-agent-module-twin.md
26+
- name: Install the Microsoft Defender for IoT micro agent (Preview)
27+
displayName: package, authentication, methods, certificate, authenticate, version
28+
href: tutorial-standalone-agent-binary-installation.md
29+
- name: Configure Microsoft Defender for IoT agent-based solution
30+
displayName: data, collection, geolocation, log analytics, raw events
31+
href: tutorial-configure-agent-based-solution.md
2932
- name: Investigate security recommendations
30-
href: quickstart-investigate-security-recommendations.md
33+
href: tutorial-investigate-security-recommendations.md
3134
- name: Investigate security alerts
32-
href: quickstart-investigate-security-alerts.md
33-
- name: Tutorials
34-
items:
35-
- name: Configure a micro agent twin
36-
href: tutorial-configure-micro-agent-twin.md
35+
href: tutorial-investigate-security-alerts.md
3736
- name: Concepts
3837
items:
3938
- name: Agent portfolio overview and OS support (Preview)
@@ -72,11 +71,10 @@
7271
- name: Connect to Microsoft Sentinel
7372
displayName: log analytics, service notes
7473
href: how-to-configure-with-sentinel.md
75-
- name: Configure Microsoft Defender for IoT agent-based solution
76-
displayName: data, collection, geolocation, log analytics, raw events
77-
href: how-to-configure-agent-based-solution.md
7874
- name: Investigate CIS benchmark recommendation
7975
href: how-to-investigate-cis-benchmark.md
76+
- name: Configure a micro agent twin
77+
href: how-to-configure-micro-agent-twin.md
8078
- name: Create custom alerts
8179
displayName: security group
8280
href: quickstart-create-custom-alerts.md

articles/defender-for-iot/device-builders/how-to-configure-agent-based-solution.md

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

0 commit comments

Comments
 (0)