Skip to content

Commit 553a684

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into overview-rewrite
2 parents 2e8e9a1 + e403393 commit 553a684

File tree

9 files changed

+688
-169
lines changed

9 files changed

+688
-169
lines changed

articles/active-directory-b2c/connect-with-saml-service-providers.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ms.topic: reference
1212
ms.date: 12/10/2019
1313
ms.author: marsma
1414
ms.subservice: B2C
15+
ms.custom: fasttrack-edit
1516
---
1617

1718
# Register a SAML application in Azure AD B2C
@@ -173,7 +174,7 @@ Now that your tenant can issue SAML assertions, you need to create the SAML rely
173174
PublicPolicyUri="http://tenant-name.onmicrosoft.com/B2C_1A_signup_signin_saml">
174175
```
175176

176-
1. Add following XML snippet just before the `<RelyingParty>` element. This XML overwrites orchestration step number 7 of the _SignUpOrSignIn_ user journey. If you customized your user journey by adding or removing orchestration steps, make sure the number (in the `order` element) is aligned with the one specified in the user journey for the token issuer step.
177+
1. Add following XML snippet just before the `<RelyingParty>` element. This XML overwrites orchestration step number 7 of the _SignUpOrSignIn_ user journey. If you started from a different folder in the starter pack, or customized your user journey by adding or removing orchestration steps, make sure the number (in the `order` element) is aligned with the one specified in the user journey for the token issuer step (for example, in the other starter pack folders it's step number 4 for `LocalAccounts`, 6 for `SocialAccounts` and 9 for `SocialAndLocalAccountsWithMfa`).
177178

178179
```XML
179180
<UserJourneys>

articles/azure-monitor/app/javascript.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Azure Application Insights for JavaScript web apps | Microsoft Docs
3-
description: Get page view and session counts, web client data, and track usage patterns. Detect exceptions and performance issues in JavaScript web pages.
2+
title: Azure Application Insights for JavaScript web apps
3+
description: Get page view and session counts, web client data, Single Page Applications (SPA), and track usage patterns. Detect exceptions and performance issues in JavaScript web pages.
44
ms.service: azure-monitor
55
ms.subservice: application-insights
66
ms.topic: conceptual

articles/cognitive-services/immersive-reader/tutorial-ios-picture-immersive-reader.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,14 @@ Subdomain => Immersive Reader resource subdomain (resource 'Name' if the reso
7070

7171
In the main project folder, which contains the ViewController.swift file, create a Swift class file called Constants.swift. Replace the class with the following code, adding in your values where applicable. Keep this file as a local file that only exists on your machine and be sure not to commit this file into source control, as it contains secrets that should not be made public. It is recommended that you do not keep secrets in your app. Instead, we recommend using a backend service to obtain the token, where the secrets can be kept outside of the app and off of the device. The backend API endpoint should be secured behind some form of authentication (for example, [OAuth](https://oauth.net/2/)) to prevent unauthorized users from obtaining tokens to use against your Immersive Reader service and billing; that work is beyond the scope of this tutorial.
7272

73-
[!code-swift[Constants](~/ImmersiveReaderSdk/iOS/samples/picture-to-immersive-reader-swift/picture-to-immersive-reader-swift/Constants.swift)]
74-
7573
## Set up the app to run without a storyboard
7674

7775
Open AppDelegate.swift and replace the file with the following code.
7876

79-
[!code-swift[AppDelegate](~/ImmersiveReaderSdk/iOS/samples/picture-to-immersive-reader-swift/picture-to-immersive-reader-swift/AppDelegate.swift)]
80-
8177
## Add functionality for taking and uploading photos
8278

8379
Rename ViewController.swift to PictureLaunchViewController.swift and replace the file with the following code.
8480

85-
[!code-swift[PictureLaunchViewController](~/ImmersiveReaderSdk/iOS/samples/picture-to-immersive-reader-swift/picture-to-immersive-reader-swift/PictureLaunchViewController.swift)]
86-
8781
## Build and run the app
8882

8983
Set the archive scheme in Xcode by selecting a simulator or device target.

articles/iot-hub/iot-hub-device-sdk-platform-support.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ The [Azure IoT Hub C device SDK](https://github.com/Azure/azure-iot-sdk-c) is te
4242
| OS | TLS library | Additional requirements |
4343
|---------------------|------------------------------|---------------------------------------------------------------------------------------------|
4444
| Linux | OpenSSL, WolfSSL, or BearSSL | Berkeley sockets</br></br>Portable Operating System Interface (POSIX) |
45-
| iOS 12.2 | OpenSSL or Native OSX | XCode emulated in OSX 10.13.4 |
45+
| iOS 12.2 | OpenSSL | XCode emulated in OSX 10.13.4 |
4646
| Windows 10 family | SChannel | |
4747
| Mbed OS 5.4 | Mbed TLS 2 | [MXChip IoT dev kit](https://microsoft.github.io/azure-iot-developer-kit/) |
4848
| Azure Sphere OS | WolfSSL | [Azure Sphere MT3620](https://azure.microsoft.com/services/azure-sphere/get-started/) |
49+
| Arduino | BearSSL | [ESP32 or ESP8266](https://github.com/Azure/azure-iot-arduino#simple-sample-instructions)
4950

5051
### Python SDK
5152

articles/marketplace/partner-center-portal/create-new-azure-apps-offer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ All Azure applications include at least two files in the root folder of a `.zip`
4343

4444
* A user interface definition for the Azure application creation experience named [createUiDefinition.json](https://docs.microsoft.com/azure/managed-applications/create-uidefinition-overview). In the user interface, you specify elements that enable consumers to provide parameter values.
4545

46-
All new Azure application offers must include an [Azure partner customer usage attribution GUID](??).
46+
All new Azure application offers must include an [Azure partner customer usage attribution GUID](https://docs.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution).
4747

4848
### Before you begin
4949

0 commit comments

Comments
 (0)