Skip to content

Commit e20ab36

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 7f8c67b + 4cee71a commit e20ab36

File tree

118 files changed

+1421
-2457
lines changed

Some content is hidden

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

118 files changed

+1421
-2457
lines changed

.openpublishing.redirection.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47875,6 +47875,24 @@
4787547875
"source_path": "articles/cognitive-services/speech-service/quickstart-platform-python.md",
4787647876
"redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?pivots=programming-language-python",
4787747877
"redirect_document_id": false
47878+
},
47879+
{
47880+
"source_path": "articles/cognitive-services/Bing-News-Search/vs-bing-news-search-connected-service.md",
47881+
"redirect_url": "/azure/cognitive-services/bing-news-search/search-the-web",
47882+
"redirect_document_id": false
47883+
},
47884+
{
47885+
"source_path": "articles/cognitive-services/Computer-vision/vs-computer-vision-connected-service.md",
47886+
"redirect_url": "/azure/cognitive-services/computer-vision/",
47887+
"redirect_document_id": false
47888+
}, {
47889+
"source_path": "articles/cognitive-services/Face/vs-face-connected-service.md",
47890+
"redirect_url": "/azure/cognitive-services/face/",
47891+
"redirect_document_id": false
47892+
}, {
47893+
"source_path": "articles/cognitive-services/text-analytics/vs-text-connected-service.md",
47894+
"redirect_url": "/azure/cognitive-services/text-analytics/",
47895+
"redirect_document_id": false
4787847896
}
4787947897
]
4788047898
}

articles/active-directory/authentication/concept-sspr-writeback.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Passwords are *not* written back in any of the following situations:
160160
* Any administrator-initiated end-user password reset from the [Microsoft 365 admin center](https://admin.microsoft.com)
161161

162162
> [!WARNING]
163-
> Use of the checkbox "User must change password at next logon" in on-premises Active Directory administrative tools like Active Directory Users and Computers or the Active Directory Administrative Center is supported as a preview feature of Azure AD Connect. For more information, see the article, [Implement password hash synchronization with Azure AD Connect sync](../hybrid/how-to-connect-password-hash-synchronization.md#public-preview-of-synchronizing-temporary-passwords-and-force-password-reset-on-next-logon).
163+
> Use of the checkbox "User must change password at next logon" in on-premises Active Directory administrative tools like Active Directory Users and Computers or the Active Directory Administrative Center is supported as a preview feature of Azure AD Connect. For more information, see the article, [Implement password hash synchronization with Azure AD Connect sync](../hybrid/how-to-connect-password-hash-synchronization.md#public-preview-of-synchronizing-temporary-passwords-and-force-password-change-on-next-logon).
164164
165165
## Next steps
166166

54.6 KB
Loading

articles/active-directory/develop/single-sign-on-macos-ios.md

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.devlang: na
1414
ms.topic: conceptual
1515
ms.tgt_pltfrm: na
1616
ms.workload: identity
17-
ms.date: 08/28/2019
17+
ms.date: 02/03/2020
1818
ms.author: twhitney
1919
ms.reviewer:
2020
ms.custom: aaddev
@@ -67,9 +67,9 @@ For the Microsoft identity platform to know which applications can share tokens,
6767

6868
The way the Microsoft identity platform tells apps that use the same Application ID apart is by their **Redirect URIs**. Each application can have multiple Redirect URIs registered in the onboarding portal. Each app in your suite will have a different redirect URI. For example:
6969

70-
App1 Redirect URI: `msauth.com.contoso.mytestapp1://auth`
71-
App2 Redirect URI: `msauth.com.contoso.mytestapp2://auth`
72-
App3 Redirect URI: `msauth.com.contoso.mytestapp3://auth`
70+
App1 Redirect URI: `msauth.com.contoso.mytestapp1://auth`
71+
App2 Redirect URI: `msauth.com.contoso.mytestapp2://auth`
72+
App3 Redirect URI: `msauth.com.contoso.mytestapp3://auth`
7373

7474
> [!IMPORTANT]
7575
> The format of redirect uris must be compatible with the format MSAL supports, which is documented in [MSAL Redirect URI format requirements](redirect-uris-ios.md#msal-redirect-uri-format-requirements).
@@ -94,6 +94,18 @@ When you have the entitlements set up correctly, you'll see a `entitlements.plis
9494
</plist>
9595
```
9696

97+
#### Add a new keychain group
98+
99+
Add a new keychain group to your project **Capabilities**. The keychain group should be:
100+
* `com.microsoft.adalcache` on iOS
101+
* `com.microsoft.identity.universalstorage` on macOS.
102+
103+
![keychain example](media/single-sign-on-macos-ios/keychain-example.png)
104+
105+
For more information, see [keychain groups](howto-v2-keychain-objc.md).
106+
107+
## Configure the application object
108+
97109
Once you have the keychain entitlement enabled in each of your applications, and you're ready to use SSO, configure `MSALPublicClientApplication` with your keychain access group as in the following example:
98110

99111
Objective-C:
@@ -111,17 +123,15 @@ Swift:
111123
```swift
112124
let config = MSALPublicClientApplicationConfig(clientId: "<my-client-id>")
113125
config.cacheConfig.keychainSharingGroup = "my.keychain.group"
114-
126+
115127
do {
116-
let application = try MSALPublicClientApplication(configuration: config)
117-
// continue on with application
128+
let application = try MSALPublicClientApplication(configuration: config)
129+
// continue on with application
118130
} catch let error as NSError {
119131
// handle error here
120-
}
132+
}
121133
```
122134

123-
124-
125135
> [!WARNING]
126136
> When you share a keychain across your applications, any application can delete users or even all of the tokens across your application.
127137
> This is particularly impactful if you have applications that rely on tokens to do background work.
@@ -204,7 +214,7 @@ func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>)
204214
MSALPublicClientApplication.handleMSALResponse(url, sourceApplication: sourceApp)
205215
}
206216
```
207-
217+
208218
## Next steps
209219

210-
Learn more about [Authentication flows and application scenarios](authentication-flows-app-scenarios.md)
220+
Learn more about [Authentication flows and application scenarios](authentication-flows-app-scenarios.md)

articles/active-directory/managed-identities-azure-resources/services-support-managed-identities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Managed identity type | All Generally Available<br>Global Azure Regions | Azure
102102

103103
Refer to the following list to configure managed identity for Azure Logic Apps (in regions where available):
104104

105-
- [Azure portal](/azure/logic-apps/create-managed-service-identity#azure-portal)
105+
- [Azure portal](/azure/logic-apps/create-managed-service-identity#enable-system-assigned-identity-in-azure-portal)
106106
- [Azure Resource Manager template](/azure/app-service/overview-managed-identity)
107107

108108
### Azure Data Factory V2

articles/aks/supported-kubernetes-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ New Supported Version List
9999
* For new **minor** versions of Kubernetes
100100
* All users are notified publicly of the new version and what version will be removed.
101101
* When a new patch version is released, the oldest patch release is removed at the same time.
102-
* Customers have **60 days** from the public notification date to upgrade to a supported minor version release.
102+
* Customers have **30 days** from the public notification date to upgrade to a supported minor version release.
103103
* For new **patch** versions of Kubernetes
104104
* All users are notified of the new patch version being released and to upgrade to the latest patch release.
105105
* Users have **30 days** to upgrade to a newer, supported patch release. Users have **30 days** to upgrade to

articles/azure-resource-manager/templates/add-resource-extensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The existing extensions are:
1616

1717
- [Microsoft.Compute/virtualMachines/extensions](https://docs.microsoft.com/azure/templates/microsoft.compute/2018-10-01/virtualmachines/extensions)
1818
- [Microsoft.Compute virtualMachineScaleSets/extensions](https://docs.microsoft.com/azure/templates/microsoft.compute/2018-10-01/virtualmachinescalesets/extensions)
19-
- [Microsoft.HDInsight clusters/extensions](https://docs.microsoft.com/azure/templates/microsoft.hdinsight/2018-06-01-preview/clusters/extensions)
19+
- [Microsoft.HDInsight clusters/extensions](https://docs.microsoft.com/azure/templates/microsoft.hdinsight/2018-06-01-preview/clusters)
2020
- [Microsoft.Sql servers/databases/extensions](https://docs.microsoft.com/azure/templates/microsoft.sql/2014-04-01/servers/databases/extensions)
2121
- [Microsoft.Web/sites/siteextensions](https://docs.microsoft.com/azure/templates/microsoft.web/2016-08-01/sites/siteextensions)
2222

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ After you trigger the restore operation, the backup service creates a job for tr
208208
There are a number of things to note after restoring a VM:
209209

210210
- Extensions present during the backup configuration are installed, but not enabled. If you see an issue, reinstall the extensions.
211-
- If the backed-up VM had a static IP address, the restored VM will have a dynamic IP address to avoid conflict. You can [add a static IP address to the restored VM](/previous-versions/azurevirtual-network/virtual-networks-reserved-private-ip.md#how-to-add-a-static-internal-ip-to-an-existing-vm).
211+
- If the backed-up VM had a static IP address, the restored VM will have a dynamic IP address to avoid conflict. You can [add a static IP address to the restored VM](/previous-versions/azure/virtual-network/virtual-networks-reserved-private-ip#how-to-add-a-static-internal-ip-to-an-existing-vm).
212212
- A restored VM doesn't have an availability set. If you use the restore disk option, then you can [specify an availability set](../virtual-machines/windows/tutorial-availability-sets.md) when you create a VM from the disk using the provided template or PowerShell.
213213
- If you use a cloud-init-based Linux distribution, such as Ubuntu, for security reasons the password is blocked after the restore. Use the VMAccess extension on the restored VM to [reset the password](../virtual-machines/linux/reset-password.md). We recommend using SSH keys on these distributions, so you don't need to reset the password after the restore.
214214
- If you are unable to access VM once restored due to VM having broken relationship with domain controller, then follow the steps below to bring up the VM:

articles/backup/backup-azure-vms-troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,6 @@ VM backup relies on issuing snapshot commands to underlying storage. Not having
274274
DHCP must be enabled inside the guest for IaaS VM backup to work. If you need a static private IP, configure it through the Azure portal or PowerShell. Make sure the DHCP option inside the VM is enabled.
275275
Get more information on how to set up a static IP through PowerShell:
276276

277-
* [How to add a static internal IP to an existing VM](/previous-versions/azure/virtual-network/virtual-networks-reserved-private-ip.md#how-to-add-a-static-internal-ip-to-an-existing-vm)
277+
* [How to add a static internal IP to an existing VM](/previous-versions/azure/virtual-network/virtual-networks-reserved-private-ip#how-to-add-a-static-internal-ip-to-an-existing-vm)
278278
* [Change the allocation method for a private IP address assigned to a network interface](../virtual-network/virtual-networks-static-private-ip-arm-ps.md#change-the-allocation-method-for-a-private-ip-address-assigned-to-a-network-interface)
279279

articles/cloud-services/cloud-services-configuration-and-management-faq.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ See [New: Configurable Idle Timeout for Azure Load Balancer](https://azure.micro
168168

169169
### How do I associate a static IP address to my Cloud Service?
170170
To set up a static IP address, you need to create a reserved IP. This reserved IP can be associated to a new Cloud Service or to an existing deployment. See the following documents for details:
171-
* [How to create a reserved IP address](/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip.md#manage-reserved-vips)
172-
* [Reserve the IP address of an existing Cloud Service](/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip.md#reserve-the-ip-address-of-an-existing-cloud-service)
173-
* [Associate a reserved IP to a new Cloud Service](/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip.md#associate-a-reserved-ip-to-a-new-cloud-service)
174-
* [Associate a reserved IP to a running deployment](/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip.md#associate-a-reserved-ip-to-a-running-deployment)
175-
* [Associate a reserved IP to a Cloud Service by using a service configuration file](/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip.md#associate-a-reserved-ip-to-a-cloud-service-by-using-a-service-configuration-file)
171+
* [How to create a reserved IP address](/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip#manage-reserved-vips)
172+
* [Reserve the IP address of an existing Cloud Service](/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip#reserve-the-ip-address-of-an-existing-cloud-service)
173+
* [Associate a reserved IP to a new Cloud Service](/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip#associate-a-reserved-ip-to-a-new-cloud-service)
174+
* [Associate a reserved IP to a running deployment](/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip#associate-a-reserved-ip-to-a-running-deployment)
175+
* [Associate a reserved IP to a Cloud Service by using a service configuration file](/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip#associate-a-reserved-ip-to-a-cloud-service-by-using-a-service-configuration-file)
176176

177177
### What are the features and capabilities that Azure basic IPS/IDS and DDOS provides?
178178
Azure has IPS/IDS in datacenter physical servers to defend against threats. In addition, customers can deploy third-party security solutions, such as web application firewalls, network firewalls, antimalware, intrusion detection, prevention systems (IDS/IPS), and more. For more information, see [Protect your data and assets and comply with global security standards](https://www.microsoft.com/en-us/trustcenter/Security/AzureSecurity).

0 commit comments

Comments
 (0)