Skip to content

Commit 5bc48c4

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into jedi3
2 parents 6313079 + 55adc68 commit 5bc48c4

File tree

272 files changed

+3963
-1704
lines changed

Some content is hidden

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

272 files changed

+3963
-1704
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,11 @@
277277
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
278278
"branch": "master"
279279
},
280+
{
281+
"path_to_root": "MachineLearningNotebooks",
282+
"url": "https://github.com/Azure/MachineLearningNotebooks",
283+
"branch": "master"
284+
},
280285
{
281286
"path_to_root": "aml-sdk-samples",
282287
"url": "https://github.com/Azure/MachineLearningNotebooks",

.openpublishing.redirection.json

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,72 +1157,72 @@
11571157
},
11581158
{
11591159
"source_path": "articles/cognitive-services/Custom-Speech-Service/cognitive-services-custom-speech-home.md",
1160-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1160+
"redirect_url": "/azure/cognitive-services/speech-service",
11611161
"redirect_document_id": false
11621162
},
11631163
{
11641164
"source_path": "articles/cognitive-services/Custom-Speech-Service/cognitive-services-custom-speech-faq.md",
1165-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1165+
"redirect_url": "/azure/cognitive-services/speech-service",
11661166
"redirect_document_id": false
11671167
},
11681168
{
11691169
"source_path": "articles/cognitive-services/Custom-Speech-Service/cognitive-services-custom-speech-get-started.md",
1170-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1170+
"redirect_url": "/azure/cognitive-services/speech-service",
11711171
"redirect_document_id": false
11721172
},
11731173
{
11741174
"source_path": "articles/cognitive-services/Custom-Speech-Service/cognitive-services-custom-speech-glossary.md",
1175-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1175+
"redirect_url": "/azure/cognitive-services/speech-service",
11761176
"redirect_document_id": false
11771177
},
11781178
{
11791179
"source_path": "articles/cognitive-services/Custom-Speech-Service/cognitive-services-custom-speech-meters.md",
1180-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1180+
"redirect_url": "/azure/cognitive-services/speech-service",
11811181
"redirect_document_id": false
11821182
},
11831183
{
11841184
"source_path": "articles/cognitive-services/Custom-Speech-Service/CustomSpeech-How-to-Topics/cognitive-services-custom-speech-change-locale.md",
1185-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1185+
"redirect_url": "/azure/cognitive-services/speech-service",
11861186
"redirect_document_id": false
11871187
},
11881188
{
11891189
"source_path": "articles/cognitive-services/Custom-Speech-Service/CustomSpeech-How-to-Topics/cognitive-services-custom-speech-create-acoustic-model.md",
1190-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1190+
"redirect_url": "/azure/cognitive-services/speech-service",
11911191
"redirect_document_id": false
11921192
},
11931193
{
11941194
"source_path": "articles/cognitive-services/Custom-Speech-Service/CustomSpeech-How-to-Topics/cognitive-services-custom-speech-create-custom-pronunciation.md",
1195-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1195+
"redirect_url": "/azure/cognitive-services/speech-service",
11961196
"redirect_document_id": false
11971197
},
11981198
{
11991199
"source_path": "articles/cognitive-services/Custom-Speech-Service/CustomSpeech-How-to-Topics/cognitive-services-custom-speech-create-endpoint.md",
1200-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1200+
"redirect_url": "/azure/cognitive-services/speech-service",
12011201
"redirect_document_id": false
12021202
},
12031203
{
12041204
"source_path": "articles/cognitive-services/Custom-Speech-Service/CustomSpeech-How-to-Topics/cognitive-services-custom-speech-create-language-model.md",
1205-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1205+
"redirect_url": "/azure/cognitive-services/speech-service",
12061206
"redirect_document_id": false
12071207
},
12081208
{
12091209
"source_path": "articles/cognitive-services/Custom-Speech-Service/CustomSpeech-How-to-Topics/cognitive-services-custom-speech-migrate-tiers.md",
1210-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1210+
"redirect_url": "/azure/cognitive-services/speech-service",
12111211
"redirect_document_id": false
12121212
},
12131213
{
12141214
"source_path": "articles/cognitive-services/Custom-Speech-Service/CustomSpeech-How-to-Topics/cognitive-services-custom-speech-subscribe.md",
1215-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1215+
"redirect_url": "/azure/cognitive-services/speech-service",
12161216
"redirect_document_id": false
12171217
},
12181218
{
12191219
"source_path": "articles/cognitive-services/Custom-Speech-Service/CustomSpeech-How-to-Topics/cognitive-services-custom-speech-transcription-guidelines.md",
1220-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1220+
"redirect_url": "/azure/cognitive-services/speech-service",
12211221
"redirect_document_id": false
12221222
},
12231223
{
12241224
"source_path": "articles/cognitive-services/Custom-Speech-Service/CustomSpeech-How-to-Topics/cognitive-services-custom-speech-use-endpoint.md",
1225-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service",
1225+
"redirect_url": "/azure/cognitive-services/speech-service",
12261226
"redirect_document_id": false
12271227
},
12281228
{
@@ -31704,6 +31704,11 @@
3170431704
"redirect_url": "/azure/key-vault/security-baseline",
3170531705
"redirect_document_id": false
3170631706
},
31707+
{
31708+
"source_path": "articles/key-vault/automation-manage-key-vault.md",
31709+
"redirect_url": "/azure/key-vault/",
31710+
"redirect_document_id": false
31711+
},
3170731712
{
3170831713
"source_path": "articles/load-balancer/load-balancer-security-attributes.md",
3170931714
"redirect_url": "/azure/load-balancer/load-balancer-security-controls",
@@ -49318,6 +49323,11 @@
4931849323
"source_path": "articles/power-bi-embedded/index.md",
4931949324
"redirect_url": "https://docs.microsoft.com/power-bi/developer/azure-pbie-what-is-power-bi-embedded",
4932049325
"redirect_document_id": false
49326+
},
49327+
{
49328+
"source_path": "articles/cognitive-services/speech-service/how-to-migrate-from-custom-speech-service.md",
49329+
"redirect_url": "/azure/cognitive-services/speech-service",
49330+
"redirect_document_id": false
4932149331
}
4932249332
]
4932349333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ If you have problems enabling Azure AD DS, review the following common errors an
2626

2727
| **Sample error Message** | **Resolution** |
2828
| --- |:--- |
29-
| *The name addscontoso.com is already in use on this network. Specify a name that is not in use.* |[Domain name conflict in the virtual network](troubleshoot.md#domain-name-conflict) |
29+
| *The name aaddscontoso.com is already in use on this network. Specify a name that is not in use.* |[Domain name conflict in the virtual network](troubleshoot.md#domain-name-conflict) |
3030
| *Domain Services could not be enabled in this Azure AD tenant. The service does not have adequate permissions to the application called 'Azure AD Domain Services Sync'. Delete the application called 'Azure AD Domain Services Sync' and then try to enable Domain Services for your Azure AD tenant.* |[Domain Services doesn't have adequate permissions to the Azure AD Domain Services Sync application](troubleshoot.md#inadequate-permissions) |
3131
| *Domain Services could not be enabled in this Azure AD tenant. The Domain Services application in your Azure AD tenant does not have the required permissions to enable Domain Services. Delete the application with the application identifier d87dcbc6-a371-462e-88e3-28ad15ec4e64 and then try to enable Domain Services for your Azure AD tenant.* |[The Domain Services application isn't configured properly in your Azure AD tenant](troubleshoot.md#invalid-configuration) |
3232
| *Domain Services could not be enabled in this Azure AD tenant. The Microsoft Azure AD application is disabled in your Azure AD tenant. Enable the application with the application identifier 00000002-0000-0000-c000-000000000000 and then try to enable Domain Services for your Azure AD tenant.* |[The Microsoft Graph application is disabled in your Azure AD tenant](troubleshoot.md#microsoft-graph-disabled) |

articles/active-directory-domain-services/tutorial-configure-ldaps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The certificate you request or create must meet the following requirements. Your
6666
* **Key usage** - The certificate must be configured for *digital signatures* and *key encipherment*.
6767
* **Certificate purpose** - The certificate must be valid for SSL server authentication.
6868

69-
In this tutorial, let's create a self-signed certificate for secure LDAP using the [New-SelfSignedCertificate][New-SelfSignedCertificate] cmdlet. Open a PowerShell window as **Administrator** and run the following commands. Replace the *$dnsName* variable with the DNS name used by your own managed domain, such as *aaddscontoso.com*:
69+
There are several tools available to create self-signed certificate such as OpenSSL, Keytool, MakeCert, [New-SelfSignedCertificate][New-SelfSignedCertificate] cmdlet etc. In this tutorial, let's create a self-signed certificate for secure LDAP using the [New-SelfSignedCertificate][New-SelfSignedCertificate] cmdlet. Open a PowerShell window as **Administrator** and run the following commands. Replace the *$dnsName* variable with the DNS name used by your own managed domain, such as *aaddscontoso.com*:
7070

7171
```powershell
7272
# Define your own DNS name used by your Azure AD DS managed domain
@@ -140,7 +140,7 @@ Before you can use the digital certificate created in the previous step with you
140140
1. As this certificate is used to decrypt data, you should carefully control access. A password can be used to protect the use of the certificate. Without the correct password, the certificate can't be applied to a service.
141141

142142
On the **Security** page, choose the option for **Password** to protect the *.PFX* certificate file. Enter and confirm a password, then select **Next**. This password is used in the next section to enable secure LDAP for your Azure AD DS managed domain.
143-
1. On the **File to Export** page, specify the file name and location where you'd like to export the certificate, such as *C:\Users\accountname\azure-ad-ds.pfx*.
143+
1. On the **File to Export** page, specify the file name and location where you'd like to export the certificate, such as *C:\Users\accountname\azure-ad-ds.pfx*. Keep a note of the password and location of the *.PFX* file as this information would be required in next steps.
144144
1. On the review page, select **Finish** to export the certificate to a *.PFX* certificate file. A confirmation dialog is displayed when the certificate has been successfully exported.
145145
1. Leave the MMC open for use in the following section.
146146

0 commit comments

Comments
 (0)