Skip to content

Commit 0dac4cb

Browse files
committed
Merge remote-tracking branch 'refs/remotes/MicrosoftDocs/master' into nitinme-adls-updates
2 parents abfc64c + ea671fe commit 0dac4cb

File tree

226 files changed

+637
-835
lines changed

Some content is hidden

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

226 files changed

+637
-835
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3830,6 +3830,11 @@
38303830
"redirect_url": "/azure/azure-stack/azure-stack-powershell-install",
38313831
"redirect_document_id": false
38323832
},
3833+
{
3834+
"source_path": "articles/azure-stack/user/azure-stack-powershell-install.md",
3835+
"redirect_url": "/azure/azure-stack/azure-stack-powershell-install",
3836+
"redirect_document_id": false
3837+
},
38333838
{
38343839
"source_path": "articles/azure-stack/azure-stack-create-vpn-connection-one-node-tp2.md",
38353840
"redirect_url": "/azure/azure-stack/azure-stack-create-vpn-connection-one-node",

articles/active-directory/active-directory-configurable-token-lifetimes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ In this example, you create a policy that requires users to authenticate more fr
277277
278278
2. Assign the policy to your service principal. You also need to get the **ObjectId** of your service principal.
279279
280-
1. To see all your organization's service principals, you can query either the [Microsoft Graph](https://developer.microsoft.com/graph/docs/api-reference/beta/resources/serviceprincipal#properties) or the [Azure AD Graph](https://msdn.microsoft.com/Library/Azure/Ad/Graph/api/entity-and-complex-type-reference#serviceprincipal-entity). Also, you can test this in the [Azure AD Graph Explorer](https://graphexplorer.cloudapp.net/), and the [Microsoft Graph Explorer](https://developer.microsoft.com/graph/graph-explorer) by using your Azure AD account.
280+
1. To see all your organization's service principals, you can query either the [Microsoft Graph](https://developer.microsoft.com/graph/docs/api-reference/beta/resources/serviceprincipal#properties) or the [Azure AD Graph](https://msdn.microsoft.com/Library/Azure/Ad/Graph/api/entity-and-complex-type-reference#serviceprincipal-entity). Also, you can test this in the [Azure AD Graph Explorer](https://graphexplorer.azurewebsites.net/), and the [Microsoft Graph Explorer](https://developer.microsoft.com/graph/graph-explorer) by using your Azure AD account.
281281
282282
2. When you have the **ObjectId** of your service principal, run the following command:
283283

articles/active-directory/active-directory-reporting-activity-sign-ins-errors.md

Lines changed: 42 additions & 33 deletions
Large diffs are not rendered by default.

articles/active-directory/index.experimental.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Azure Active Directory (Azure AD) is a multi-tenant, cloud-based directory and i
9898
<p>
9999
<a href="/azure/active-directory/active-directory-identityprotection">Identity protection</a><br/>
100100
<a href="/azure/active-directory/active-directory-conditional-access-azure-portal">Conditional access</a><br/>
101-
<a href="/azure/active-directory/active-directory-privileged-identity-management-configure">Privileged identity management</a>
101+
<a href="/azure/active-directory/active-directory-privileged-identity-management-configure?toc=%2fazure%2factive-directory%2fprivileged-identity-management%2ftoc.json">Privileged identity management</a>
102102
</p>
103103
</div>
104104
</div>

articles/active-directory/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Azure Active Directory (Azure AD) is a multi-tenant, cloud-based directory and i
9898
<p>
9999
<a href="/azure/active-directory/active-directory-identityprotection">Identity protection</a><br/>
100100
<a href="/azure/active-directory/active-directory-conditional-access-azure-portal">Conditional access</a><br/>
101-
<a href="/azure/active-directory/active-directory-privileged-identity-management-configure">Privileged identity management</a>
101+
<a href="/azure/active-directory/active-directory-privileged-identity-management-configure?toc=%2fazure%2factive-directory%2fprivileged-identity-management%2ftoc.json">Privileged identity management</a>
102102
</p>
103103
</div>
104104
</div>

articles/active-directory/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ With the introduction of a field called **Client App** in the Sign-in activity l
103103
**Product capability:** GoLocal
104104

105105

106-
Customers in Europe requires their data to stay in Europe and not replicated outside of European datacenters for meeting privacy and European laws. This [article](https://go.microsoft.com/fwlink/?linkid=872328%20) provides the specific details on what identity information will be stored within Europe and also provide details on information that will be stored outside European datacenters.
106+
Customers in Europe requires their data to stay in Europe and not replicated outside of European datacenters for meeting privacy and European laws. This [article](https://go.microsoft.com/fwlink/?linkid=872328) provides the specific details on what identity information will be stored within Europe and also provide details on information that will be stored outside European datacenters.
107107

108108

109109

articles/app-service-mobile/TOC.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
## [What are Mobile Apps?](app-service-mobile-value-prop.md)
55
## [App Service plans](../app-service/azure-web-sites-web-hosting-plans-in-depth-overview.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
66

7-
# Get Started
8-
## Create mobile apps
9-
### [Android](app-service-mobile-android-get-started.md)
10-
### [Cordova](app-service-mobile-cordova-get-started.md)
11-
### [iOS](app-service-mobile-ios-get-started.md)
12-
### [Windows](app-service-mobile-windows-store-dotnet-get-started.md)
13-
### [Xamarin.Android](app-service-mobile-xamarin-android-get-started.md)
14-
### [Xamarin.Forms](app-service-mobile-xamarin-forms-get-started.md)
15-
### [Xamarin.iOS](app-service-mobile-xamarin-ios-get-started.md)
7+
# Quickstarts
8+
## [Android](app-service-mobile-android-get-started.md)
9+
## [Cordova](app-service-mobile-cordova-get-started.md)
10+
## [iOS](app-service-mobile-ios-get-started.md)
11+
## [Windows](app-service-mobile-windows-store-dotnet-get-started.md)
12+
## [Xamarin.Android](app-service-mobile-xamarin-android-get-started.md)
13+
## [Xamarin.Forms](app-service-mobile-xamarin-forms-get-started.md)
14+
## [Xamarin.iOS](app-service-mobile-xamarin-ios-get-started.md)
1615

1716
# How To
1817

articles/app-service-mobile/app-service-mobile-cordova-get-started-push.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ This tutorial assumes that you have an Apache Cordova application that was devel
3232

3333
To complete this tutorial, you need:
3434

35-
* A PC with [Visual Studio Community 2015][2] or later
35+
* A PC with [Visual Studio Community 2015][2] or later
3636
* [Visual Studio Tools for Apache Cordova][4]
3737
* An [active Azure account][3]
3838
* A completed [Apache Cordova quickstart][5] project
3939
* (Android) A [Google account][6] with a verified email address
4040
* (iOS) An [Apple Developer Program membership][7] and an iOS device (iOS Simulator does not support push notifications)
41-
* (Windows) A [Windows Store developer account][8] and a Windows 10 device
41+
* (Windows) A [Microsoft Store Developer Account][8] and a Windows 10 device
4242

4343
## <a name="configure-hub"></a>Configure a notification hub
4444
[!INCLUDE [app-service-mobile-configure-notification-hub](../../includes/app-service-mobile-configure-notification-hub.md)]

articles/app-service-mobile/app-service-mobile-dotnet-how-to-use-client-library.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -905,8 +905,8 @@ private async Task AuthenticateAsync()
905905
To authenticate users, you must register your app at the Microsoft account Developer Center. Configure the
906906
registration details on your Mobile App backend. To create a Microsoft account registration and
907907
connect it to your Mobile App backend, complete the steps in
908-
[Register your app to use a Microsoft account login]. If you have both Windows Store and Windows Phone
909-
8/Silverlight versions of your app, register the Windows Store version first.
908+
[Register your app to use a Microsoft account login]. If you have both Microsoft Store and Windows Phone
909+
8/Silverlight versions of your app, register the Microsoft Store version first.
910910
911911
The following code authenticates using Live SDK and uses the returned token to sign in to your Mobile
912912
App backend.
@@ -920,7 +920,7 @@ private async System.Threading.Tasks.Task AuthenticateAsync()
920920
// Get the URL the Mobile App backend.
921921
var serviceUrl = App.MobileService.ApplicationUri.AbsoluteUri;
922922

923-
// Create the authentication client for Windows Store using the service URL.
923+
// Create the authentication client for Microsoft Store using the service URL.
924924
LiveAuthClient liveIdClient = new LiveAuthClient(serviceUrl);
925925
//// Create the authentication client for Windows Phone using the client ID of the registration.
926926
//LiveAuthClient liveIdClient = new LiveAuthClient(clientId);
@@ -1004,7 +1004,7 @@ cached and reused until it expires. For more information, see [Caching the authe
10041004
10051005
### <a name="caching"></a>Caching the authentication token
10061006
In some cases, the call to the login method can be avoided after the first successful authentication by storing
1007-
the authentication token from the provider. Windows Store and UWP apps can use [PasswordVault] to cache the
1007+
the authentication token from the provider. Microsoft Store and UWP apps can use [PasswordVault] to cache the
10081008
current authentication token after a successful sign-in, as follows:
10091009
10101010
```
@@ -1062,7 +1062,7 @@ await client.LoginAsync(MobileServiceAuthenticationProvider.Facebook, token);
10621062
The following topics cover Push Notifications:
10631063
10641064
* [Register for Push Notifications](#register-for-push)
1065-
* [Obtain a Windows Store package SID](#package-sid)
1065+
* [Obtain a Microsoft Store package SID](#package-sid)
10661066
* [Register with Cross-platform templates](#register-xplat)
10671067
10681068
### <a name="register-for-push"></a>How to: Register for Push Notifications
@@ -1082,20 +1082,20 @@ private async void InitNotificationsAsync()
10821082
}
10831083
```
10841084
1085-
If you are pushing to WNS, then you MUST [obtain a Windows Store package SID](#package-sid). For more information
1085+
If you are pushing to WNS, then you MUST [obtain a Microsoft Store package SID](#package-sid). For more information
10861086
on Windows apps, including how to register for template registrations, see [Add push notifications to your app].
10871087
10881088
Requesting tags from the client is not supported. Tag Requests are silently dropped from registration.
10891089
If you wish to register your device with tags, create a Custom API that uses the Notification Hubs API to perform
10901090
the registration on your behalf. [Call the Custom API](#customapi) instead of the `RegisterNativeAsync()` method.
10911091
1092-
### <a name="package-sid"></a>How to: Obtain a Windows Store package SID
1093-
A package SID is needed for enabling push notifications in Windows Store apps. To receive a package SID, register your
1094-
application with the Windows Store.
1092+
### <a name="package-sid"></a>How to: Obtain a Microsoft Store package SID
1093+
A package SID is needed for enabling push notifications in Microsoft Store apps. To receive a package SID, register your
1094+
application with the Microsoft Store.
10951095
10961096
To obtain this value:
10971097
1098-
1. In Visual Studio Solution Explorer, right-click the Windows Store app project, click **Store** > **Associate App with the Store...**.
1098+
1. In Visual Studio Solution Explorer, right-click the Microsoft Store app project, click **Store** > **Associate App with the Store...**.
10991099
2. In the wizard, click **Next**, sign in with your Microsoft account, type a name for your app in **Reserve a new app name**, then click **Reserve**.
11001100
3. After the app registration is successfully created, select the app name, click **Next**, and then click **Associate**.
11011101
4. Log in to the [Windows Dev Center] using your Microsoft Account. Under **My apps**, click the app registration you created.

articles/app-service-mobile/app-service-mobile-node-backend-how-to-use-server-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ of the Mobile Apps back end. The system property names are:
934934
* deleted
935935
* version
936936

937-
You can even edit table operations by using App Service Editor. When you select **Easy tables** in your back-end site
937+
You can even edit table operations by using App Service Editor. When you select **Easy tables** in your back-end site
938938
settings, you can add, modify, or delete a table. You can also see data in the table.
939939

940940
![Work with Easy Tables](./media/app-service-mobile-node-backend-how-to-use-server-sdk/mobile-apps-easy-tables.png)

0 commit comments

Comments
 (0)