Skip to content

Commit ba4bcea

Browse files
authored
Merge pull request #107623 from MicrosoftDocs/master
3/13 AM Publish
2 parents c29b787 + 3d2cacf commit ba4bcea

File tree

84 files changed

+407
-376
lines changed

Some content is hidden

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

84 files changed

+407
-376
lines changed

.openpublishing.redirection.json

Lines changed: 19 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
{
@@ -49323,6 +49323,11 @@
4932349323
"source_path": "articles/power-bi-embedded/index.md",
4932449324
"redirect_url": "https://docs.microsoft.com/power-bi/developer/azure-pbie-what-is-power-bi-embedded",
4932549325
"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
4932649331
}
4932749332
]
4932849333
}

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/manage-apps/application-proxy-security.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: identity
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: conceptual
15-
ms.date: 09/08/2017
15+
ms.date: 03/13/2020
1616
ms.author: mimart
1717
ms.reviewer: japere
1818
ms.custom: it-pro
@@ -77,13 +77,9 @@ Unpatched software still accounts for a large number of attacks. Azure AD Applic
7777

7878
To improve the security of applications published by Azure AD Application Proxy, we block web crawler robots from indexing and archiving your applications. Each time a web crawler robot tries to retrieve the robot's settings for a published app, Application Proxy replies with a robots.txt file that includes `User-agent: * Disallow: /`.
7979

80-
### DDOS prevention
80+
#### Azure DDoS protection service
8181

82-
Applications published through Application Proxy are protected against Distributed Denial of Service (DDOS) attacks.
83-
84-
The Application Proxy service monitors the amount of traffic attempting to reach your applications and network. If the number of devices requesting remote access to your applications spikes, Microsoft throttles access to your network.
85-
86-
Microsoft watches traffic patterns for individual applications and for your subscription as a whole. If one application receives higher than normal requests, then requests to access that application are denied for a short period of time. If you receive higher than normal requests across your whole subscription, then requests to access any of your apps are denied. This preventative measure keeps your application servers from being overloaded by remote access requests, so that your on-premises users can keep accessing their apps.
82+
Applications published through Application Proxy are protected against Distributed Denial of Service (DDoS) attacks. **Azure DDoS protection** is a service offered with the Azure platform to protect your Azure resources from denial of service attacks. The **Basic** service tier is automatically enabled, providing always-on traffic monitoring and real-time mitigation of common network-level attacks. A **Standard** tier is also available, offering additional mitigation capabilities that are tuned specifically to Azure Virtual Network resources. For details, see [Azure DDoS Protection Standard overview](https://docs.microsoft.com/azure/virtual-network/ddos-protection-overview).
8783

8884
## Under the hood
8985

articles/active-directory/users-groups-roles/groups-lifecycle.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: active-directory
1111
ms.workload: identity
1212
ms.subservice: users-groups-roles
1313
ms.topic: article
14-
ms.date: 01/03/2020
14+
ms.date: 03/13/2020
1515
ms.author: curtand
1616
ms.reviewer: krbain
1717
ms.custom: it-pro
@@ -39,7 +39,7 @@ For information on how to download and install the Azure AD PowerShell cmdlets,
3939

4040
## Activity-based automatic renewal
4141

42-
With Azure AD intelligence, groups are now automatically renewed based on whether they have been recently used. This feature eliminates the need for manual action by group owners, because it's based on user activity in groups across Office 365 services like Outlook, SharePoint, Teams, or Yammer. For example, if an owner or a group member does something like upload a document in SharePoint, visit a Teams channel, or send an email to the group in Outlook, the group is automatically renewed and the owner does not get any renewal notifications.
42+
With Azure AD intelligence, groups are now automatically renewed based on whether they have been recently used. This feature eliminates the need for manual action by group owners, because it's based on user activity in groups across Office 365 services like Outlook, SharePoint, or Teams. For example, if an owner or a group member does something like upload a document in SharePoint, visit a Teams channel, or send an email to the group in Outlook, the group is automatically renewed and the owner does not get any renewal notifications.
4343

4444
### Activities that automatically renew group expiration
4545

@@ -132,7 +132,7 @@ Here are examples of how you can use PowerShell cmdlets to configure the expirat
132132
```
133133

134134
1. Configure the expiration settings
135-
Use the New-AzureADMSGroupLifecyclePolicy cmdlet to set the lifetime for all Office 365 groups in the Azure AD organization to 365 days. Renewal notifications for Office 365 groups without owners will be sent to [email protected]
135+
Use the New-AzureADMSGroupLifecyclePolicy cmdlet to set the lifetime for all Office 365 groups in the Azure AD organization to 365 days. Renewal notifications for Office 365 groups without owners will be sent to '[email protected]'
136136

137137
``` PowerShell
138138
New-AzureADMSGroupLifecyclePolicy -GroupLifetimeInDays 365 -ManagedGroupTypes All -AlternateNotificationEmails [email protected]
@@ -143,7 +143,7 @@ Here are examples of how you can use PowerShell cmdlets to configure the expirat
143143

144144
- The policy ID
145145
- The lifetime for all Office 365 groups in the Azure AD organization is set to 365 days
146-
- Renewal notifications for Office 365 groups without owners will be sent to [email protected].
146+
- Renewal notifications for Office 365 groups without owners will be sent to '[email protected].'
147147

148148
```powershell
149149
Get-AzureADMSGroupLifecyclePolicy

articles/aks/certificate-rotation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ AKS generates and uses the following certificates, Certificate Authorities, and
4747
4848
Use [az aks get-credentials][az-aks-get-credentials] to sign in to your AKS cluster. This command also downloads and configures the `kubectl` client certificate on your local machine.
4949
50-
```console
50+
```azurecli
5151
az aks get-credentials -g $RESOURCE_GROUP_NAME -n $CLUSTER_NAME
5252
```
5353
5454
Use `az aks rotate-certs` to rotate all certificates, CAs, and SAs on your cluster.
5555

56-
```console
56+
```azurecli
5757
az aks rotate-certs -g $RESOURCE_GROUP_NAME -n $CLUSTER_NAME
5858
```
5959

@@ -69,7 +69,7 @@ Unable to connect to the server: x509: certificate signed by unknown authority (
6969

7070
Update the certificate used by `kubectl` by running `az aks get-credentials`.
7171

72-
```console
72+
```azurecli
7373
az aks get-credentials -g $RESOURCE_GROUP_NAME -n $CLUSTER_NAME --overwrite-existing
7474
```
7575

articles/aks/cluster-container-registry-integration.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ az acr create -n $MYACR -g myContainerRegistryResourceGroup --sku basic
3737
# Create an AKS cluster with ACR integration
3838
az aks create -n myAKSCluster -g myResourceGroup --generate-ssh-keys --attach-acr $MYACR
3939
```
40+
4041
Alternatively, you can specify the ACR name using an ACR resource ID, which has the following format:
4142

4243
`/subscriptions/\<subscription-id\>/resourceGroups/\<resource-group-name\>/providers/Microsoft.ContainerRegistry/registries/\<name\>`
@@ -54,17 +55,22 @@ Integrate an existing ACR with existing AKS clusters by supplying valid values f
5455
```azurecli
5556
az aks update -n myAKSCluster -g myResourceGroup --attach-acr <acrName>
5657
```
58+
5759
or,
58-
```
60+
61+
```azurecli
5962
az aks update -n myAKSCluster -g myResourceGroup --attach-acr <acr-resource-id>
6063
```
6164

6265
You can also remove the integration between an ACR and an AKS cluster with the following
66+
6367
```azurecli
6468
az aks update -n myAKSCluster -g myResourceGroup --detach-acr <acrName>
6569
```
70+
6671
or
67-
```
72+
73+
```azurecli
6874
az aks update -n myAKSCluster -g myResourceGroup --detach-acr <acr-resource-id>
6975
```
7076

@@ -89,7 +95,7 @@ az aks get-credentials -g myResourceGroup -n myAKSCluster
8995

9096
Create a file called **acr-nginx.yaml** that contains the following:
9197

92-
```
98+
```yaml
9399
apiVersion: apps/v1
94100
kind: Deployment
95101
metadata:
@@ -114,16 +120,20 @@ spec:
114120
```
115121
116122
Next, run this deployment in your AKS cluster:
117-
```
123+
124+
```console
118125
kubectl apply -f acr-nginx.yaml
119126
```
120127

121128
You can monitor the deployment by running:
122-
```
129+
130+
```console
123131
kubectl get pods
124132
```
133+
125134
You should have two running pods.
126-
```
135+
136+
```output
127137
NAME READY STATUS RESTARTS AGE
128138
nginx0-deployment-669dfc4d4b-x74kr 1/1 Running 0 20s
129139
nginx0-deployment-669dfc4d4b-xdpd6 1/1 Running 0 20s

articles/aks/configure-kubenet.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Use *Azure CNI* when:
8080

8181
- You have available IP address space.
8282
- Most of the pod communication is to resources outside of the cluster.
83-
- You dont want to manage the UDRs.
83+
- You don't want to manage the UDRs.
8484
- You need AKS advanced features such as virtual nodes or Azure Network Policy. Use [Calico network policies][calico-network-policies].
8585

8686
For more information to help you decide which network model to use, see [Compare network models and their support scope][network-comparisons].
@@ -114,9 +114,11 @@ az ad sp create-for-rbac --skip-assignment
114114

115115
The following example output shows the application ID and password for your service principal. These values are used in additional steps to assign a role to the service principal and then create the AKS cluster:
116116

117-
```console
118-
$ az ad sp create-for-rbac --skip-assignment
117+
```azurecli
118+
az ad sp create-for-rbac --skip-assignment
119+
```
119120

121+
```output
120122
{
121123
"appId": "476b3636-5eda-4c0e-9751-849e70b5cfad",
122124
"displayName": "azure-cli-2019-01-09-22-29-24",

articles/aks/scale-cluster.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ az aks show --resource-group myResourceGroup --name myAKSCluster --query agentPo
2222

2323
The following example output shows that the *name* is *nodepool1*:
2424

25-
```console
26-
$ az aks show --resource-group myResourceGroup --name myAKSCluster --query agentPoolProfiles
27-
25+
```output
2826
[
2927
{
3028
"count": 1,

0 commit comments

Comments
 (0)