resolve the conflcit

Author: huypub

docs-conceptual/azps-1.8.0/toc.yml

@@ -2,6 +2,7 @@
   href: overview.md
 - name: Introducing the new Az module
   href: new-azureps-module-az.md
+  displayName: intro, introduction, azurerm
 - name: Install
   href: install-az-ps.md
 - name: Uninstall
@@ -10,26 +11,42 @@
   items:
   - name: Migration steps
     href: migrate-from-azurerm-to-az.md
+    displayName: migrate, azurerm, az
   - name: Changes between AzureRM and Az
     href: migrate-az-1.0.0.md
+    displayName: breaking, cmdlet, module, names
 - name: Get started
   href: get-started-azureps.md
+  displayName: sign in, signin, log in, login, find, feedback, intro, introduction
 - name: Cloud Shell
   href: https://docs.microsoft.com/azure/cloud-shell/overview
 - name: Sign in
   items: 
   - name: Authentication methods
     href: authenticate-azureps.md
+    displayName: >-
+      sign in, signin, log in, login, credentials, msi, managed identity,
+      tenant, subscription, region, certificate, service principal,
+      authenticate
   - name: Create a service principal
     href: create-azure-service-principal-azureps.md
+    displayName: >-
+      automation, application, web app, script, certificate, sign in,
+      signin, log in, login, devops, dev ops, itpro, it pro, role,
+      aad, authentication, authenticate
   - name: Persistent credentials
     href: context-persistence.md
+    displayName: >-
+      sign in, signin, log in, login, process, session
 - name: Queries
   href: queries-azureps.md
+  displayName: filter, search, format, output, variable, scripting, array, dictionary, map, object
 - name: Format output 
   href: formatting-output.md
+  displayName: object, table, yaml, json, xml, csv, html, list
 - name: Manage subscriptions
   href: manage-subscriptions-azureps.md
+  displayName: tenant, user, sign in, signin, log in, login, authenticate, authentication, accounts
 - name: Deploy
   items:
   - name: Deploy Resource Manager templates
@@ -40,10 +57,9 @@
     href: /azure/azure-resource-manager/resource-manager-powershell-sas-token
 - name: Concepts
   items:
-  - name: Experimental modules
-    href: using-experimental-modules.md
   - name: PowerShell jobs
     href: using-psjobs.md
+    displayName: background, task, scripting, automation
 - name: Tutorials
   items:
   - name: Create Virtual Machines
@@ -52,13 +68,16 @@
   items:
   - name: Linux Virtual Machines
     href: /azure/virtual-machines/linux/powershell-samples?toc=%2fpowershell%2fmodule%2ftoc.json
+    displayName: vms
   - name: Windows Virtual Machines
     href: /azure/virtual-machines/windows/powershell-samples?toc=%2fpowershell%2fmodule%2ftoc.json
+    displayName: vms
   - name: Web Apps
     href: /azure/app-service-web/app-service-powershell-samples?toc=%2fpowershell%2fmodule%2ftoc.json
   - name: SQL Databases
     href: /azure/sql-database/sql-database-powershell-samples?toc=%2fpowershell%2fmodule%2ftoc.json
   - name: Cosmos DB
     href: /azure/cosmos-db/powershell-samples?toc=%2fpowershell%2fmodules%2ftoc.json
+    displayName: database, nosql, mongodb, couchdb
 - name: Release notes
-  href: release-notes-azureps.md
+  href: release-notes-azureps.md

docs-conceptual/azps-1.8.0/using-experimental-modules.md

@@ -2,6 +2,7 @@
   href: overview.md
 - name: Introducing the new Az module
   href: new-azureps-module-az.md
+  displayName: intro, introduction, azurerm
 - name: Install
   href: install-az-ps.md
 - name: Uninstall
@@ -10,26 +11,42 @@
   items:
   - name: Migration steps
     href: migrate-from-azurerm-to-az.md
+    displayName: migrate, azurerm, az
   - name: Changes between AzureRM and Az
     href: migrate-az-1.0.0.md
+    displayName: breaking, cmdlet, module, names
 - name: Get started
   href: get-started-azureps.md
+  displayName: sign in, signin, log in, login, find, feedback, intro, introduction
 - name: Cloud Shell
   href: https://docs.microsoft.com/azure/cloud-shell/overview
 - name: Sign in
   items: 
   - name: Authentication methods
     href: authenticate-azureps.md
+    displayName: >-
+      sign in, signin, log in, login, credentials, msi, managed identity,
+      tenant, subscription, region, certificate, service principal,
+      authenticate
   - name: Create a service principal
     href: create-azure-service-principal-azureps.md
+    displayName: >-
+      automation, application, web app, script, certificate, sign in,
+      signin, log in, login, devops, dev ops, itpro, it pro, role,
+      aad, authentication, authenticate
   - name: Persistent credentials
     href: context-persistence.md
+    displayName: >-
+      sign in, signin, log in, login, process, session
 - name: Queries
   href: queries-azureps.md
+  displayName: filter, search, format, output, variable, scripting, array, dictionary, map, object
 - name: Format output 
   href: formatting-output.md
+  displayName: object, table, yaml, json, xml, csv, html, list
 - name: Manage subscriptions
   href: manage-subscriptions-azureps.md
+  displayName: tenant, user, sign in, signin, log in, login, authenticate, authentication, accounts
 - name: Deploy
   items:
   - name: Deploy Resource Manager templates
@@ -40,10 +57,9 @@
     href: /azure/azure-resource-manager/resource-manager-powershell-sas-token
 - name: Concepts
   items:
-  - name: Experimental modules
-    href: using-experimental-modules.md
   - name: PowerShell jobs
     href: using-psjobs.md
+    displayName: background, task, scripting, automation
 - name: Tutorials
   items:
   - name: Create Virtual Machines
@@ -52,14 +68,17 @@
   items:
   - name: Linux Virtual Machines
     href: /azure/virtual-machines/linux/powershell-samples?toc=%2fpowershell%2fmodule%2ftoc.json
+    displayName: vms
   - name: Windows Virtual Machines
     href: /azure/virtual-machines/windows/powershell-samples?toc=%2fpowershell%2fmodule%2ftoc.json
+    displayName: vms
   - name: Web Apps
     href: /azure/app-service-web/app-service-powershell-samples?toc=%2fpowershell%2fmodule%2ftoc.json
   - name: SQL Databases
     href: /azure/sql-database/sql-database-powershell-samples?toc=%2fpowershell%2fmodule%2ftoc.json
   - name: Cosmos DB
     href: /azure/cosmos-db/powershell-samples?toc=%2fpowershell%2fmodules%2ftoc.json
+    displayName: database, nosql, mongodb, couchdb
 - name: Release notes
   items:
   - name: Az 2.1.0 release notes