Skip to content

Commit b47ec03

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into tmoverviewmvc
2 parents 62c3eb6 + f94380d commit b47ec03

17 files changed

+287
-54
lines changed

articles/active-directory/b2b/current-limitations.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,13 @@ With Azure AD B2B, you can enforce multi-factor authentication at the resource o
2424
## Instant-on
2525
In the B2B collaboration flows, we add users to the directory and dynamically update them during invitation redemption, app assignment, and so on. The updates and writes ordinarily happen in one directory instance and must be replicated across all instances. Replication is completed once all instances are updated. Sometimes when the object is written or updated in one instance and the call to retrieve this object is to another instance, replication latencies can occur. If that happens, refresh or retry to help. If you are writing an app using our API, then retries with some back-off is a good, defensive practice to alleviate this issue.
2626

27+
## Azure AD directories
28+
Azure AD B2B is subject to Azure AD service directory limits. For details about the number of directories a user can create and the number of directories to which a user or guest user can belong, see [Azure AD service limits and restrictions](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-service-limits-restrictions).
29+
2730
## Next steps
2831

2932
See the following articles on Azure AD B2B collaboration:
3033

3134
- [What is Azure AD B2B collaboration?](what-is-b2b.md)
32-
- [Delegate B2bB collaboration invitations](delegate-invitations.md)
35+
- [Delegate B2B collaboration invitations](delegate-invitations.md)
3336

articles/active-directory/connect/active-directory-aadconnect-version-history.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Download| [Download Azure AD Connect](http://go.microsoft.com/fwlink/?LinkId=615
5555

5656
### Fixed issues
5757

58+
- Fixed a bug where the AAD Connect server would show high CPU usage after upgrading to .Net 4.7.2
5859
- Fixed a bug that would intermittently produce an error message for an auto-resolved SQL deadlock issue
5960
- Fixed several accessibility issues for the Sync Rules Editor and the Sync Service Manager
6061
- Fixed a bug where Azure AD Connect can not get registry setting information

articles/active-directory/managed-service-identity/how-to-manage-ua-identity-powershell.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ In this article, you learn how to create, list and delete a user assigned identi
3535
- [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to create, read (list), update, and delete a user assigned identity.
3636
- [Managed Identity Operator](/azure/role-based-access-control/built-in-roles#managed-identity-operator) role to read (list) the properties of a user assigned identity.
3737

38+
> [!NOTE]
39+
> While user assigned identities are still in preview you need to first manually install the AzureRM.ManagedServiceIdentity module using the following command.
40+
```azurepowershell-interactive
41+
Install-Module -Name AzureRM.ManagedServiceIdentity -AllowPrerelease
42+
```
43+
3844
## Create a user assigned identity
3945

4046
To create a user assigned identity, use the [New-AzureRmUserAssignedIdentity](/powershell/module/azurerm.managedserviceidentity/new-azurermuserassignedidentity) command. The `ResourceGroupName` parameter specifies the resource group where to create the user assigned identity, and the `-Name` parameter specifies its name. Replace the `<RESOURCE GROUP>` and `<USER ASSIGNED IDENTITY NAME>` parameter values with your own values:

articles/application-gateway/url-route-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure Application Gatewaty URL-based content routing overview
2+
title: Azure Application Gateway URL-based content routing overview
33
description: This article provides an overview of the Application Gateway URL-based content routing, UrlPathMap configuration and PathBasedRouting rule.
44
documentationcenter: na
55
services: application-gateway

articles/application-insights/app-insights-ip-addresses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ You need to open some outgoing ports in your server's firewall to allow the Appl
3434

3535
| Purpose | URL | IP | Ports |
3636
| --- | --- | --- | --- |
37-
| Telemetry |dc.services.visualstudio.com<br/>dc.applicationinsights.microsoft.com |40.114.241.141<br/>104.45.136.42<br/>40.84.189.107<br/>168.63.242.221<br/>52.167.221.184<br/>52.169.64.244<br/>40.85.218.175<br/>104.211.92.54 | 443 |
37+
| Telemetry |dc.services.visualstudio.com<br/>dc.applicationinsights.microsoft.com |40.114.241.141<br/>104.45.136.42<br/>40.84.189.107<br/>168.63.242.221<br/>52.167.221.184<br/>52.169.64.244<br/>40.85.218.175<br/>104.211.92.54<br/>52.175.198.74 | 443 |
3838
| Live Metrics Stream |rt.services.visualstudio.com<br/>rt.applicationinsights.microsoft.com |23.96.28.38<br/>13.92.40.198 |443 |
3939

4040
## Status Monitor

articles/automation/automation-hrw-run-runbooks.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ Hybrid Runbook Workers can be configured to run only signed runbooks with some c
163163
164164
### Create Signing Certificate
165165

166-
The following example creates a self signed certificate that can be used for signing runbooks. The sample creates the certificate and exports it. The certificate is imported into the Hybrid Runbook Workers later. The thumbprint is returned as well, this is used later to reference the certificate.
166+
The following example creates a self-signed certificate that can be used for signing runbooks. The sample creates the certificate and exports it. The certificate is imported into the Hybrid Runbook Workers later. The thumbprint is returned as well, this is used later to reference the certificate.
167167

168168
```powershell
169-
# Create a self signed runbook that can be used for code signing
169+
# Create a self-signed certificate that can be used for code signing
170170
$SigningCert = New-SelfSignedCertificate -CertStoreLocation cert:\LocalMachine\my `
171171
-Subject "CN=contoso.com" `
172172
-KeyAlgorithm RSA `
@@ -205,14 +205,14 @@ Set-HybridRunbookWorkerSignatureValidation -Enable $true -TrustedCertStoreLocati
205205

206206
### Sign your Runbooks using the certificate
207207

208-
With the Hybrid Runbook workers configured to use only signed runbooks. You must sign runbooks that are to be used on the Hybrid Runbook Worker. Use the following sample PowerShell to sign your runbooks.
208+
With the Hybrid Runbook workers configured to use only signed runbooks, you must sign runbooks that are to be used on the Hybrid Runbook Worker. Use the following sample PowerShell to sign your runbooks.
209209

210210
```powershell
211211
$SigningCert = ( Get-ChildItem -Path cert:\LocalMachine\My\<CertificateThumbprint>)
212212
Set-AuthenticodeSignature .\TestRunbook.ps1 -Certificate $SigningCert
213213
```
214214

215-
Once the runbook has been signed, it must be imported into your Automation Account and published with the signature block. To learn how import runbooks, see [Importing a runbook from a file into Azure Automation](automation-creating-importing-runbook.md#importing-a-runbook-from-a-file-into-azure-automation).
215+
When the runbook has been signed, it must be imported into your Automation Account and published with the signature block. To learn how to import runbooks, see [Importing a runbook from a file into Azure Automation](automation-creating-importing-runbook.md#importing-a-runbook-from-a-file-into-azure-automation).
216216

217217
## Troubleshoot
218218

articles/automation/automation-runbook-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ By default, Verbose and Progress records are not written to job history. You can
2828
### Changing runbook settings with the Azure portal
2929
You can change settings for a runbook in the Azure portal from the **Settings** blade for the runbook.
3030

31-
1. In the Azure portal, select **Automation** and then then click the name of an automation account.
31+
1. In the Azure portal, select **Automation** and then click the name of an automation account.
3232
2. Select the **Runbooks** tab.
3333
3. Click the name of a runbook and you are directed to the settings blade for the runbook. From here you can specify or modify tags, the runbook description, configure logging and tracing settings, and access support tools to help you solve problems.
3434

articles/azure-functions/ip-addresses.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,12 @@ Each function app has a single inbound IP address. To find that IP address:
3535
3. Select **Platform features**.
3636
4. Select **Properties**, and the inbound IP address appears under **Virtual IP address**.
3737

38-
Under **Platform features**, an alternative way to find IP addresses is to select **Diagnose and Solve Problems > Check IP Configuration**.
39-
4038
## Function app outbound IP addresses
4139

4240
Each function app has a set of available outbound IP addresses. Any outbound connection from a function, such as to a back-end database, uses one of the available outbound IP addresses as the origin IP address. You can't know beforehand which IP address a given connection will use. For this reason, your back-end service must open its firewall to all of the function app's outbound IP addresses.
4341

4442
To find the outbound IP addresses available to a function app:
4543

46-
1. Sign in to the [Azure portal](https://portal.azure.com).
47-
2. Navigate to the function app.
48-
3. Select **Platform features > Diagnose and Solve Problems > Check IP Configuration**.
49-
50-
To find the IP addresses that would be available when the function app scales to other pricing tiers:
51-
5244
1. Sign in to the [Azure Resource Explorer](https://resources.azure.com).
5345
2. Select **subscriptions > {your subscription} > providers > Microsoft.Web > sites**.
5446
3. In the JSON panel, find the site with an `id` property that ends in the name of your function app.

articles/azure-government/TOC.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
### [Monitoring + Management](documentation-government-services-monitoringandmanagement.md)
5454
### [Developer Tools](documentation-government-services-devtools.md)
5555
## [CSP for Azure Government](documentation-government-csp-application.md)
56+
### [Approved resellers](documentation-government-csp-list.md)
5657
## Certifications
5758
### [ITAR](documentation-government-overview-itar.md)
5859
### [Justice and Public Safety](documentation-government-overview-jps.md)

0 commit comments

Comments
 (0)