Skip to content

Commit e594943

Browse files
huypubhuypub
authored
Merge pull request #85368 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 82c4be9 + dde9732 commit e594943

File tree

3 files changed

+12
-26
lines changed

3 files changed

+12
-26
lines changed

‎articles/app-service/web-sites-purchase-ssl-web-site.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Use the following table to help you configure the certificate. When finished, cl
4646
| Setting | Description |
4747
|-|-|
4848
| Name | A friendly name for your App Service certificate. |
49-
| Naked Domain Host Name | If you specify the root domain here, you get a certificate that secures *both* the root domain and the `www` subdomain. To secure any subdomain only, specify the fully qualified domain name of the subdomain here (for example, `mysubdomain.contoso.com`). |
49+
| Naked Domain Host Name | Specify the root domain here. The issued certificate secures *both* the root domain and the `www` subdomain. In the issued certificate, the Common Name field contains the root domain, and the Subject Alternative Name field contains the `www` domain. To secure any subdomain only, specify the fully qualified domain name of the subdomain here (for example, `mysubdomain.contoso.com`).|
5050
| Subscription | The datacenter where the web app is hosted. |
5151
| Resource group | The resource group that contains the certificate. You can use a new resource group or select the same resource group as your App Service app, for example. |
5252
| Certificate SKU | Determines the type of certificate to create, whether a standard certificate or a [wildcard certificate](https://wikipedia.org/wiki/Wildcard_certificate). |

‎articles/network-watcher/network-watcher-connectivity-rest.md

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: network-watcher
55
documentationcenter: na
66
author: KumudD
77
manager: twooley
8-
editor:
8+
editor:
99

1010
ms.service: network-watcher
1111
ms.devlang: na
@@ -46,7 +46,7 @@ armclient login
4646

4747
## Retrieve a virtual machine
4848

49-
Run the following script to return a virtual machine. This information is needed for running connectivity.
49+
Run the following script to return a virtual machine. This information is needed for running connectivity.
5050

5151
The following code needs values for the following variables:
5252

@@ -86,7 +86,7 @@ $subscriptionId = "00000000-0000-0000-0000-000000000000"
8686
$resourceGroupName = "NetworkWatcherRG"
8787
$networkWatcherName = "NetworkWatcher_westcentralus"
8888
$sourceResourceId = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ContosoRG/providers/Microsoft.Compute/virtualMachines/MultiTierApp0"
89-
$destinationAddress = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ContosoRG/providers/Microsoft.Compute/virtualMachines/Database0"
89+
$destinationResourceId = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ContosoRG/providers/Microsoft.Compute/virtualMachines/Database0"
9090
$destinationPort = "0"
9191
$requestBody = @"
9292
{
@@ -95,7 +95,7 @@ $requestBody = @"
9595
'port': 0
9696
},
9797
'destination': {
98-
'resourceId': '${destinationAddress}',
98+
'resourceId': '${destinationResourceId}',
9999
'port': ${destinationPort}
100100
}
101101
}
@@ -202,7 +202,7 @@ $subscriptionId = "00000000-0000-0000-0000-000000000000"
202202
$resourceGroupName = "NetworkWatcherRG"
203203
$networkWatcherName = "NetworkWatcher_westcentralus"
204204
$sourceResourceId = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ContosoRG/providers/Microsoft.Compute/virtualMachines/MultiTierApp0"
205-
$destinationAddress = "13.107.21.200"
205+
$destinationResourceId = "13.107.21.200"
206206
$destinationPort = "80"
207207
$requestBody = @"
208208
{
@@ -211,7 +211,7 @@ $requestBody = @"
211211
'port': 0
212212
},
213213
'destination': {
214-
'address': '${destinationAddress}',
214+
'address': '${destinationResourceId}',
215215
'port': ${destinationPort}
216216
}
217217
}
@@ -298,7 +298,7 @@ $subscriptionId = "00000000-0000-0000-0000-000000000000"
298298
$resourceGroupName = "NetworkWatcherRG"
299299
$networkWatcherName = "NetworkWatcher_westcentralus"
300300
$sourceResourceId = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ContosoRG/providers/Microsoft.Compute/virtualMachines/MultiTierApp0"
301-
$destinationAddress = "https://bing.com"
301+
$destinationResourceId = "https://bing.com"
302302
$destinationPort = "0"
303303
$requestBody = @"
304304
{
@@ -307,7 +307,7 @@ $requestBody = @"
307307
'port': 0
308308
},
309309
'destination': {
310-
'address': '${destinationAddress}',
310+
'address': '${destinationResourceId}',
311311
'port': ${destinationPort}
312312
}
313313
}
@@ -385,7 +385,7 @@ $subscriptionId = "00000000-0000-0000-0000-000000000000"
385385
$resourceGroupName = "NetworkWatcherRG"
386386
$networkWatcherName = "NetworkWatcher_westcentralus"
387387
$sourceResourceId = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ContosoRG/providers/Microsoft.Compute/virtualMachines/MultiTierApp0"
388-
$destinationAddress = "https://build2017nwdiag360.blob.core.windows.net/"
388+
$destinationResourceId = "https://build2017nwdiag360.blob.core.windows.net/"
389389
$destinationPort = "0"
390390
$requestBody = @"
391391
{
@@ -394,7 +394,7 @@ $requestBody = @"
394394
'port': 0
395395
},
396396
'destination': {
397-
'address': '${destinationAddress}',
397+
'address': '${destinationResourceId}',
398398
'port': ${destinationPort}
399399
}
400400
}
@@ -466,17 +466,3 @@ The following example is the response from running the previous API call. As the
466466
Learn how to automate packet captures with Virtual machine alerts by viewing [Create an alert triggered packet capture](network-watcher-alert-triggered-packet-capture.md).
467467

468468
Find if certain traffic is allowed in or out of your VM by visiting [Check IP flow verify](diagnose-vm-network-traffic-filtering-problem.md).
469-
470-
471-
472-
473-
474-
475-
476-
477-
478-
479-
480-
481-
482-

‎articles/sql-database/sql-database-aad-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ To create a contained database user in Azure SQL Database, Managed Instance, or
9393
- `SUSER_ID(<admin name>)`
9494
- `SUSER_SID(<admin name>)`
9595

96-
### Manage Instances
96+
### Managed Instances
9797

9898
- Azure AD server principals (logins) and users are supported as a preview feature for [Managed Instances](sql-database-managed-instance.md).
9999
- Setting Azure AD server principals (logins) mapped to an Azure AD group as database owner is not supported in [Managed Instances](sql-database-managed-instance.md).

0 commit comments

Comments
 (0)