Merge branch 'master' into dns-private-faq

Author: vhorne

.gitignore

@@ -1,5 +1,5 @@
 # Operating System files
- .DS_Store
+.DS_Store
 Thumbs.db
 
 # Visual Studio and VS Code files
@@ -21,4 +21,4 @@ _themes.VS.Modern/
 articles/directories.txt
 AzureMigration.ps1
 
-!/.vscode/extensions.json
+!/.vscode/extensions.json

.openpublishing.publish.config.json

@@ -21,7 +21,9 @@
       "version": 0
     }
   ],
-  "notification_subscribers": [],
+  "notification_subscribers": [
+    "[email protected]"
+  ],
   "sync_notification_subscribers": [
     "[email protected]"
   ],
@@ -74,11 +76,13 @@
       "path_to_root": "policy-templates",
       "url": "https://github.com/Azure/azure-policy",
       "branch": "master",
-      "branch_mapping": {
-        "release-build-mysql": "release-build",
-        "release-build-postgresql": "release-build",
-        "release-build-stellar": "release-build"
-      }
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "blueprints-templates",
+      "url": "https://github.com/Azure/azure-blueprints",
+      "branch": "master",
+      "branch_mapping": {}
     },
     {
       "path_to_root": "azure-docs-json-samples",
@@ -206,6 +210,12 @@
       "branch": "tutorial",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "samples-tsi",
+      "url": "https://github.com/Azure-Samples/Azure-Time-Series-Insights",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "media-services-v3-dotnet-core-tutorials",
       "url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-tutorials",
@@ -296,6 +306,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmosdb-nodejs-get-started",
+      "url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-api-nodejs-getting-started",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cognitive-services-content-moderator-samples",
       "url": "https://github.com/Azure-Samples/cognitive-services-content-moderator-samples",

.openpublishing.redirection.json

@@ -1,7 +1,5 @@
 # Contributing to Microsoft Azure Documentation
 
-> Between March 5th and March 9th 2019, the MicrosoftDocs/azure-docs repo will be undergoing a Migration from it's current Markdown engine to the [Markdig](https://github.com/lunet-io/markdig) markdown engine. During this time, we will be turning off the ability to suspending merging of public pull requests in order to complete the migration.
-
 Thank you for taking the time to contribute to the Microsoft Azure documentation.
 
 This guide covers some general topics around contribution and refers out to our [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations where relevant.

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Welcome to the open source [documentation](https://docs.microsoft.com/azure) of
 
 ## Getting Started
 
-Contributing to open source is more than just providing updates, it's also letting us know when there is an issue. Read our [Contributing guidance](.github/CONTRIBUTING.md) to find out more.
+Contributing to open source is more than just providing updates, it's also letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
 
 ### Prerequisites
 

README.md

@@ -56,6 +56,8 @@
       href: active-directory-b2c-overview-custom.md
     - name: User access
       href: manage-user-access.md
+  - name: JavaScript and page contracts
+    href: user-flow-javascript-overview.md
   - name: OAuth 2.0
     href: active-directory-b2c-reference-oauth-code.md
   - name: OpenId Connect
@@ -70,8 +72,6 @@
     href: manage-user-data.md
   - name: User flows
     href: active-directory-b2c-reference-policies.md
-  - name: User flows with JavaScript
-    href: user-flow-javascript-overview.md
   - name: User interface customization
     href: customize-ui-overview.md
 - name: How-to guides
@@ -84,8 +84,8 @@
     href: add-native-application.md
   - name: Configure age gating
     href: basic-age-gating.md
-  - name: Configure tokens
-    href: active-directory-b2c-token-session-sso.md
+  - name: Configure session behavior
+    href: session-behavior.md
   - name: Customize language
     href: active-directory-b2c-reference-language-customization.md
   - name: Customize password
@@ -110,8 +110,6 @@
       href: active-directory-b2c-ui-customization-custom.md
     - name: Customize the UI dynamically
       href: active-directory-b2c-ui-customization-custom-dynamic.md
-    - name: Customize tokens
-      href: active-directory-b2c-reference-manage-sso-and-token-configuration.md
     - name: Define custom attributes
       href: active-directory-b2c-create-custom-attributes-profile-edit-custom.md
     - name: Enable keep me signed in
@@ -146,8 +144,6 @@
         href: active-directory-b2c-custom-setup-twitter-idp.md
     - name: Page contract
       href: page-contract.md
-    - name: Pass through access token
-      href: idp-pass-through-custom.md
     - name: Password complexity
       href: active-directory-b2c-reference-password-complexity-custom.md
     - name: Password change
@@ -158,6 +154,12 @@
         href: active-directory-b2c-custom-setup-adfs2016-idp.md
       - name: Salesforce
         href: active-directory-b2c-setup-sf-app-custom.md
+    - name: Tokens
+      items:
+      - name: Customize tokens
+        href: active-directory-b2c-reference-manage-sso-and-token-configuration.md
+      - name: Pass through access token
+        href: idp-pass-through-custom.md
     - name: Track user behavior
       href: active-directory-b2c-custom-guide-eventlogger-appins.md
     - name: Reference
@@ -271,10 +273,6 @@
       href: active-directory-b2c-devquickstarts-ios.md
     - name: Android using App Auth
       href: active-directory-b2c-devquickstarts-android.md
-  - name: Obtain access tokens
-    href: active-directory-b2c-access-tokens.md
-  - name: Pass through access token
-    href: idp-pass-through-user-flow.md
   - name: Report usage
     href: active-directory-b2c-reference-usage-reporting-api.md
   - name: Resource owner password credentials
@@ -283,6 +281,14 @@
     href: direct-signin.md
   - name: Set up self-serve-password reset
     href: active-directory-b2c-reference-sspr.md
+  - name: Tokens
+    items:
+    - name: Configure tokens
+      href: configure-tokens.md
+    - name: Pass through access token
+      href: idp-pass-through-user-flow.md
+    - name: Request access token
+      href: active-directory-b2c-access-tokens.md
   - name: Use b2clogin.com
     href: b2clogin.md
   - name: Use the Azure AD Graph API
@@ -291,6 +297,8 @@
     items:
     - name: Code samples
       href: https://azure.microsoft.com/resources/samples/?service=active-directory-b2c
+    - name: Cookie definitions
+      href: cookie-definitions.md
     - name: Region availability & data residency
       href: active-directory-b2c-reference-tenant-type.md
     - name: Enable billing