Merge pull request #1 from MicrosoftDocs/master

pulling latest updates

Author: SibonayK

.openpublishing.redirection.json

@@ -25,6 +25,21 @@
             "redirect_url": "/azure/active-directory/users-groups-roles/directory-self-service-signup",
             "redirect_document_id": true
         },
+        {
+            "source_path": "articles/active-directory/active-directory-certificate-based-authentication-get-started.md",
+            "redirect_url": "/azure/active-directory/authentication/active-directory-certificate-based-authentication-get-started",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/active-directory/active-directory-certificate-based-authentication-android.md",
+            "redirect_url": "/azure/active-directory/authentication/active-directory-certificate-based-authentication-android",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/active-directory/active-directory-certificate-based-authentication-ios.md",
+            "redirect_url": "/azure/active-directory/authentication/active-directory-certificate-based-authentication-ios",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/active-directory/active-directory-service-limits-restrictions.md",
             "redirect_url": "/azure/active-directory/users-groups-roles/directory-service-limits-restrictions",
@@ -7163,6 +7178,11 @@
             "redirect_url": "https://docs.microsoft.com/azure/cosmos-db/faq#moving-to-cosmos-db",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/cosmos-db/20-days-of-tips.md",
+            "redirect_url": "https://docs.microsoft.com/azure/cosmos-db/",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/cosmos-db/graph-sdk-dotnet.md",
             "redirect_url": "https://docs.microsoft.com/azure/cosmos-db/create-sql-api-dotnet",
@@ -21164,7 +21184,7 @@
         },
         {
             "source_path": "articles/security-center/security-center-resolve-endpoint-protection-health-alerts.md",
-            "redirect_url": "/azure/security-center-faq.md",
+            "redirect_url": "/azure/security-center/security-center-faq",
             "redirect_document_id": false
         },
         {
@@ -23542,6 +23562,11 @@
             "redirect_url": "/azure/active-directory/privileged-identity-management/pim-security-wizard",
             "redirect_document_id": true
         },
+        {
+            "source_path": "articles/active-directory/privileged-identity-management/pim-resource-roles-require-mfa.md",
+            "redirect_url": "/azure/active-directory/privileged-identity-management/pim-resource-roles-configure-role-settings",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/cosmos-db/troubleshoot-azure-cosmosdb.md",
             "redirect_url": "/azure/cosmos-db/storage-explorer",
@@ -25924,7 +25949,12 @@
         },
         {
             "source_path": "articles/iot-suite/iot-suite-remote-monitoring-test.md",
-            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-test",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-create-simulated-device",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-accelerators/iot-accelerators-remote-monitoring-test.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-create-simulated-device",
             "redirect_document_id": false
         },
         {
@@ -26069,7 +26099,12 @@
         },
         {
             "source_path": "articles/iot-suite/iot-suite-time-series-insights.md",
-            "redirect_url": "/azure/iot-accelerators/iot-accelerators-time-series-insights",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-time-series-insights",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-accelerators-time-series-insights.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-time-series-insights",
             "redirect_document_id": false
         },
         {
@@ -27405,6 +27440,11 @@
             "source_path": "articles/cognitive-services/LUIS/luis-reference-gdpr.md",
             "redirect_url": "/azure/cognitive-services/LUIS/luis-user-privacy",
             "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/azure-government/documentation-government-get-started-connect-with-vsts.md",
+            "redirect_url": "/azure/azure-government/documentation-government-get-started-connect-with-vs",
+            "redirect_document_id" : true
         }
     ]
 }

articles/active-directory-b2c/TOC.yml

@@ -36,6 +36,20 @@
       href: active-directory-b2c-tutorials-spa-webapi.md
 - name: Samples
   href: code-samples.md
+- name: Concepts
+  items:
+  - name: Applications types
+    href: active-directory-b2c-apps.md
+  - name: Authentication protocols
+    href: active-directory-b2c-reference-protocols.md
+  - name: OAuth 2.0
+    href: active-directory-b2c-reference-oauth-code.md
+  - name: OpenId Connect
+    href: active-directory-b2c-reference-oidc.md
+  - name: Tokens
+    href: active-directory-b2c-reference-tokens.md
+  - name: User accounts
+    href: user-overview.md
 - name: How-to guides
   items:
   - name: Register your application
@@ -44,8 +58,6 @@
     href: active-directory-b2c-reference-policies.md
   - name: Mobile & desktop apps
     items:
-    - name: Overview
-      href: active-directory-b2c-reference-oauth-code.md
     - name: iOS
       items:
       - name: iOS Swift using MSAL
@@ -66,8 +78,6 @@
       href: configure-ropc.md
   - name: Web apps
     items:
-    - name: Overview
-      href: active-directory-b2c-reference-oidc.md
     - name: ASP.NET
       href: active-directory-b2c-devquickstarts-web-dotnet-susi.md
     - name: ASP.NET Core
@@ -237,14 +247,6 @@
     items:
     - name: Code samples
       href: https://azure.microsoft.com/resources/samples/?service=active-directory-b2c
-    - name: Glossary
-      items:
-      - name: Type of applications
-        href: active-directory-b2c-apps.md
-      - name: Authentication protocols
-        href: active-directory-b2c-reference-protocols.md
-      - name: Tokens
-        href: active-directory-b2c-reference-tokens.md
     - name: Region availability & data residency
       href: active-directory-b2c-reference-tenant-type.md
     - name: Enable billing

articles/active-directory-b2c/active-directory-b2c-access-tokens.md

@@ -75,7 +75,7 @@ When requesting an access token, the client application needs to specify the des
 > Currently, custom domains are not supported along with access tokens. You must use your tenantName.onmicrosoft.com domain in the request URL.
 
 ```
-https://login.microsoftonline.com/tfp/<tenantName>.onmicrosoft.com/<yourPolicyId>/oauth2/v2.0/authorize?client_id=<appID_of_your_client_application>&nonce=anyRandomValue&redirect_uri=<redirect_uri_of_your_client_application>&scope=https%3A%2F%2Fcontoso.onmicrosoft.com%2Fnotes%2Fread&response_type=code 
+https://<tenantName>.b2clogin.com/tfp/<tenantName>.onmicrosoft.com/<yourPolicyId>/oauth2/v2.0/authorize?client_id=<appID_of_your_client_application>&nonce=anyRandomValue&redirect_uri=<redirect_uri_of_your_client_application>&scope=https%3A%2F%2Fcontoso.onmicrosoft.com%2Fnotes%2Fread&response_type=code 
 ```
 
 To acquire multiple permissions in the same request, you can add multiple entries in the single **scope** parameter, separated by spaces. For example:

articles/active-directory-b2c/active-directory-b2c-configure-signup-self-asserted-custom.md

@@ -247,7 +247,7 @@ The signup screen in test mode should look similar to this:
   "exp": 1493596822,
   "nbf": 1493593222,
   "ver": "1.0",
-  "iss": "https://login.microsoftonline.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
+  "iss": "https://contoso.b2clogin.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
   "sub": "9c2a3a9e-ac65-4e46-a12d-9557b63033a9",
   "aud": "4e87c1dd-e5f5-4ac8-8368-bc6a98751b8b",
   "acr": "b2c_1a_trustf_signup_signin",

articles/active-directory-b2c/active-directory-b2c-create-custom-attributes-profile-edit-custom.md

@@ -242,7 +242,7 @@ The ID token sent back to your application includes the new extension property a
   "exp": 1493585187,
   "nbf": 1493581587,
   "ver": "1.0",
-  "iss": "https://login.microsoftonline.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
+  "iss": "https://contoso.b2clogin.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
   "sub": "a58e7c6c-7535-4074-93da-b0023fbaf3ac",
   "aud": "4e87c1dd-e5f5-4ac8-8368-bc6a98751b8b",
   "acr": "b2c_1a_trustframeworkprofileedit",

articles/active-directory-b2c/active-directory-b2c-custom-guide-eventlogger-appins.md

@@ -296,7 +296,7 @@ Any parameter name included as part of an OIDC or OAuth2 request can be mapped t
 Here's a sample request from the application:
 
 ```
-https://login.microsoftonline.com/sampletenant.onmicrosoft.com/oauth2/v2.0/authorize?p=B2C_1A_signup_signin&client_id=e1d2612f-c2bc-4599-8e7b-d874eaca1ae1&nonce=defaultNonce&redirect_uri=https%3A%2F%2Fjwt.ms&scope=openid&response_type=id_token&prompt=login&app_session=0a2b45c&loyalty_number=1234567
+https://sampletenant.b2clogin.com/tfp/sampletenant.onmicrosoft.com/B2C_1A_signup_signin/oauth2/v2.0/authorize?client_id=e1d2612f-c2bc-4599-8e7b-d874eaca1ae1&nonce=defaultNonce&redirect_uri=https%3A%2F%2Fjwt.ms&scope=openid&response_type=id_token&prompt=login&app_session=0a2b45c&loyalty_number=1234567
 
 ```
 You can then add the claims by adding an `Input Claim` element to the Application Insights event. Properties of an event are added through the syntax {property:NAME}, where NAME is property being added to the event. For example:

articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw-secure-basic.md

@@ -322,7 +322,7 @@ After your RESTful service is protected by the client ID (username) and secret,
       "exp": 1507125903,
       "nbf": 1507122303,
       "ver": "1.0",
-      "iss": "https://login.microsoftonline.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
+      "iss": "https://contoso.b2clogin.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
       "aud": "e1d2612f-c2bc-4599-8e7b-d874eaca1ee1",
       "acr": "b2c_1a_signup_signin",
       "nonce": "defaultNonce",

articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw-secure-cert.md

@@ -132,7 +132,7 @@ To support client certificate authentication in your custom policy, change the t
      "exp": 1507125903,
      "nbf": 1507122303,
      "ver": "1.0",
-     "iss": "https://login.microsoftonline.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
+     "iss": "https://contoso.b2clogin.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
      "aud": "e1d2612f-c2bc-4599-8e7b-d874eaca1ee1",
      "acr": "b2c_1a_signup_signin",
      "nonce": "defaultNonce",

articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw.md

@@ -362,7 +362,7 @@ After you add the new claim, the relying party code looks like this:
   "exp": 1507125903,
   "nbf": 1507122303,
   "ver": "1.0",
-  "iss": "https://login.microsoftonline.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
+  "iss": "https://contoso.b2clogin.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
   "aud": "e1d2612f-c2bc-4599-8e7b-d874eaca1ee1",
   "acr": "b2c_1a_signup_signin",
   "nonce": "defaultNonce",